From: khizmax <khizmax@gmail.com>
Date: Thu, 18 Sep 2014 14:59:54 +0000 (+0400)
Subject: VC: fix some compiler errors
X-Git-Tag: v2.0.0~347
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=e98c5eb6210b5679720810e926032bc63dd9efce;p=libcds.git

VC: fix some compiler errors
---

diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h
index 103d9fe8..c118faa4 100644
--- a/cds/compiler/vc/defs.h
+++ b/cds/compiler/vc/defs.h
@@ -118,6 +118,12 @@
 // Explicit conversion operator (VC12+)
 #define CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT
 
+#if CDS_COMPILER_VERSION == CDS_COMPILER_MSVC12
+    // VC12: move ctor cannot be defaulted
+    // Error: C2610 [move ctor] is not a special member function which can be defaulted
+#   define CDS_DISABLE_DEFAULT_MOVE_CTOR
+#endif
+
 // <cstdint>
 #include <cstdint>
 
diff --git a/cds/refcounter.h b/cds/refcounter.h
index bce9805f..c7798d23 100644
--- a/cds/refcounter.h
+++ b/cds/refcounter.h
@@ -74,10 +74,10 @@ namespace cds {
     };
 
     /// Signed 32bit reference counter
-    typedef ref_counter<cds::int32_t>       signed_ref_counter;
+    typedef ref_counter<int32_t>       signed_ref_counter;
 
     /// Unsigned 32bit reference counter
-    typedef ref_counter<cds::uint32_t>      unsigned_ref_counter;
+    typedef ref_counter<uint32_t>      unsigned_ref_counter;
 
 } // namespace cds