Fixed compiler errors

diff --git a/cds/container/rwqueue.h b/cds/container/rwqueue.h
index c25d18e42051c37c793b148ae908bde0177ae7be..c08d2dff5e8d5e563fba32c7b4c56411f8e846e6 100644 (file)
--- a/cds/container/rwqueue.h
+++ b/cds/container/rwqueue.h
@@ -357,7 +357,7 @@ namespace cds { namespace container {
 
         //@cond
         /// The class has no internal statistics. For test consistency only
-        nullptr_t statistics() const
+        std::nullptr_t statistics() const
         {
             return nullptr;
         }

diff --git a/tests/test-hdr/tree/hdr_intrusive_bintree.h b/tests/test-hdr/tree/hdr_intrusive_bintree.h
index f511966c4c2562cdff61e3ed16d77238d61614a9..6bd4b55c27a2f2798cd887f9682f419ad0a81dfb 100644 (file)
--- a/tests/test-hdr/tree/hdr_intrusive_bintree.h
+++ b/tests/test-hdr/tree/hdr_intrusive_bintree.h
@@ -56,7 +56,6 @@ namespace tree {
                 , nValue(val)
             {}
 
-#   ifdef _DEBUG
             base_hook_value( base_hook_value&& s )
                 : Hook()
                 , nKey(s.nKey)
@@ -68,7 +67,6 @@ namespace tree {
                 nValue = s.nValue;
                 return *this;
             }
-#   endif
         };
 
         template <typename Hook>
@@ -91,7 +89,7 @@ namespace tree {
                 : nKey(key)
                 , nValue(val)
             {}
-#   ifdef _DEBUG
+
             member_hook_value( member_hook_value&& s )
                 : nKey(s.nKey)
                 , nValue(s.nValue)
@@ -103,7 +101,6 @@ namespace tree {
                 nValue = s.nValue;
                 return *this;
             }
-#   endif
         };
 
         template <typename ValueType>

diff --git a/tests/unit/queue/queue_type.h b/tests/unit/queue/queue_type.h
index a866c17ae2e6519808a7913590c7207a69f96a08..37dae5f16290f20e70864983b94bae45e074cd5e 100644 (file)
--- a/tests/unit/queue/queue_type.h
+++ b/tests/unit/queue/queue_type.h
@@ -605,7 +605,7 @@ namespace std {
         return o;
     }
 
-    static inline std::ostream& operator <<( std::ostream& o, nullptr_t /*s*/ )
+    static inline std::ostream& operator <<( std::ostream& o, std::nullptr_t /*s*/ )
     {
         return o;
     }