From 7fdc489ec96714de5e207b03401cb205608f147c Mon Sep 17 00:00:00 2001
From: khizmax <libcds.dev@gmail.com>
Date: Wed, 15 Jul 2015 08:29:36 +0300
Subject: [PATCH] Fixed compiler errors

---
 cds/container/rwqueue.h                     | 2 +-
 tests/test-hdr/tree/hdr_intrusive_bintree.h | 5 +----
 tests/unit/queue/queue_type.h               | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/cds/container/rwqueue.h b/cds/container/rwqueue.h
index c25d18e4..c08d2dff 100644
--- 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 f511966c..6bd4b55c 100644
--- 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 a866c17a..37dae5f1 100644
--- 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;
     }
-- 
2.34.1