Fixed issues found by Cppcheck

[libcds.git] / cds / algo / atomic.h

diff --git a/cds/algo/atomic.h b/cds/algo/atomic.h
index 7872fc056eec9ba9dc84ac9f4d52ab559daa66df..51d26f83f57ff8a5e3a98fa6a0a561f1e2a09f29 100644 (file)
--- a/cds/algo/atomic.h
+++ b/cds/algo/atomic.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_CXX11_ATOMIC_H
-#define __CDS_CXX11_ATOMIC_H
+#ifndef CDSLIB_CXX11_ATOMIC_H
+#define CDSLIB_CXX11_ATOMIC_H
 
 #include <cds/details/defs.h>
 
@@ -187,7 +187,7 @@ namespace cds {
             {}
 
             /// Returns current value of the counter
-            counter_type    value(atomics::memory_order order = atomics::memory_order_relaxed) const
+            counter_type value(atomics::memory_order order = atomics::memory_order_relaxed) const
             {
                 return m_Counter.load( order );
             }
@@ -199,13 +199,13 @@ namespace cds {
             }
 
             /// Returns underlying atomic interface
-            atomic_type&  getAtomic()
+            atomic_type& getAtomic()
             {
                 return m_Counter;
             }
 
             /// Returns underlying atomic interface (const)
-            const atomic_type&  getAtomic() const
+            const atomic_type& getAtomic() const
             {
                 return m_Counter;
             }
@@ -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;
             }
@@ -316,4 +316,4 @@ namespace cds {
     }   // namespace atomicity
 }   // namespace cds
 
-#endif // #ifndef __CDS_CXX11_ATOMIC_H
+#endif // #ifndef CDSLIB_CXX11_ATOMIC_H