From 3c467ca688a1382b770499496d8e138b1ac6b89c Mon Sep 17 00:00:00 2001
From: khizmax <khizmax@gmail.com>
Date: Thu, 10 Dec 2015 18:44:17 +0300
Subject: [PATCH] Fixed issues found by Cppcheck

---
 cds/algo/atomic.h                        | 14 +++++++-------
 cds/algo/backoff_strategy.h              |  8 ++++----
 cds/sync/spinlock.h                      |  6 +++---
 tests/unit/queue/queue_reader_writer.cpp |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cds/algo/atomic.h b/cds/algo/atomic.h
index 92bb48d9..51d26f83 100644
--- a/cds/algo/atomic.h
+++ b/cds/algo/atomic.h
@@ -264,7 +264,7 @@ namespace cds {
             typedef size_t counter_type    ;  ///< Counter type
         public:
             /// Returns 0
-            counter_type value(atomics::memory_order /*order*/ = atomics::memory_order_relaxed) const
+            static counter_type value(atomics::memory_order /*order*/ = atomics::memory_order_relaxed)
             {
                 return 0;
             }
@@ -276,35 +276,35 @@ namespace cds {
             }
 
             /// Dummy increment. Always returns 0
-            size_t inc(atomics::memory_order /*order*/ = atomics::memory_order_relaxed)
+            static size_t inc(atomics::memory_order /*order*/ = atomics::memory_order_relaxed)
             {
                 return 0;
             }
 
             /// Dummy increment. Always returns 0
-            size_t dec(atomics::memory_order /*order*/ = atomics::memory_order_relaxed)
+            static size_t dec(atomics::memory_order /*order*/ = atomics::memory_order_relaxed)
             {
                 return 0;
             }
 
             /// Dummy pre-increment. Always returns 0
-            size_t operator ++()
+            size_t operator ++() const
             {
                 return 0;
             }
             /// Dummy post-increment. Always returns 0
-            size_t operator ++(int)
+            size_t operator ++(int) const
             {
                 return 0;
             }
 
             /// Dummy pre-decrement. Always returns 0
-            size_t operator --()
+            size_t operator --() const
             {
                 return 0;
             }
             /// Dummy post-decrement. Always returns 0
-            size_t operator --(int)
+            size_t operator --(int) const
             {
                 return 0;
             }
diff --git a/cds/algo/backoff_strategy.h b/cds/algo/backoff_strategy.h
index de098c5b..7a087292 100644
--- a/cds/algo/backoff_strategy.h
+++ b/cds/algo/backoff_strategy.h
@@ -65,7 +65,7 @@ namespace cds {
                 return pr();
             }
 
-            void reset() const CDS_NOEXCEPT
+            static void reset() CDS_NOEXCEPT
             {}
             //@endcond
         };
@@ -87,7 +87,7 @@ namespace cds {
                 return false;
             }
 
-            void reset() const CDS_NOEXCEPT
+            static void reset() CDS_NOEXCEPT
             {}
             //@endcond
         };
@@ -115,7 +115,7 @@ namespace cds {
                 return false;
             }
 
-            void reset() const CDS_NOEXCEPT
+            static void reset() CDS_NOEXCEPT
             {}
             //@endcond
         };
@@ -146,7 +146,7 @@ namespace cds {
                 return false;
             }
 
-            void reset() const CDS_NOEXCEPT
+            static void reset() CDS_NOEXCEPT
             {}
         //@endcond
         };
diff --git a/cds/sync/spinlock.h b/cds/sync/spinlock.h
index 274c82fb..794271a8 100644
--- a/cds/sync/spinlock.h
+++ b/cds/sync/spinlock.h
@@ -255,7 +255,7 @@ namespace cds {
             {}
 
             /// Construct object for specified state
-            reentrant_spin_lock( bool bLocked ) CDS_NOEXCEPT
+            explicit reentrant_spin_lock( bool bLocked ) CDS_NOEXCEPT_( noexcept(lock()))
                 : m_spin(0)
                 , m_OwnerId( OS::c_NullThreadId )
             {
@@ -287,7 +287,7 @@ namespace cds {
             }
 
             /// Try to lock the object
-            bool try_lock( unsigned int nTryCount ) CDS_NOEXCEPT_( noexcept( try_acquire( nTryCount ) ) )
+            bool try_lock( unsigned int nTryCount ) CDS_NOEXCEPT_( noexcept( try_acquire( nTryCount )))
             {
                 thread_id tid = OS::get_current_thread_id();
                 if ( try_taken_lock( tid ) )
@@ -300,7 +300,7 @@ namespace cds {
             }
 
             /// Lock the object waits if it is busy
-            void lock() CDS_NOEXCEPT
+            void lock() CDS_NOEXCEPT_( noexcept( acquire()))
             {
                 thread_id tid = OS::get_current_thread_id();
                 if ( !try_taken_lock( tid ) ) {
diff --git a/tests/unit/queue/queue_reader_writer.cpp b/tests/unit/queue/queue_reader_writer.cpp
index 940be70a..6624ec5d 100644
--- a/tests/unit/queue/queue_reader_writer.cpp
+++ b/tests/unit/queue/queue_reader_writer.cpp
@@ -242,11 +242,10 @@ namespace queue {
 
             // Test that all items have been popped
             CPPUNIT_MSG( "   Test consistency of popped sequence..." );
-            size_t nErrors = 0;
             for ( size_t nWriter = 0; nWriter < s_nWriterThreadCount; ++nWriter ) {
                 std::vector<size_t> arrData;
                 arrData.reserve( m_nThreadPushCount );
-                nErrors = 0;
+                size_t nErrors = 0;
                 for ( size_t nReader = 0; nReader < arrReaders.size(); ++nReader ) {
                     ReaderIterator it = arrReaders[nReader]->m_WriterData[nWriter].begin();
                     ReaderIterator itEnd = arrReaders[nReader]->m_WriterData[nWriter].end();
@@ -263,6 +262,7 @@ namespace queue {
                     for ( it = arrReaders[nReader]->m_WriterData[nWriter].begin(); it != itEnd; ++it )
                         arrData.push_back( *it );
                 }
+
                 std::sort( arrData.begin(), arrData.end() );
                 nErrors = 0;
                 for ( size_t i=1; i < arrData.size(); ++i ) {
-- 
2.34.1