VC: fix some compiler errors
authorkhizmax <khizmax@gmail.com>
Thu, 18 Sep 2014 14:59:54 +0000 (18:59 +0400)
committerkhizmax <khizmax@gmail.com>
Thu, 18 Sep 2014 14:59:54 +0000 (18:59 +0400)
cds/compiler/vc/defs.h
cds/refcounter.h

index 103d9fe8929d723786d6f382c484f342a3af11ac..c118faa49bb9c331c584fcb266a528135a0c5b33 100644 (file)
 // 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>
 
index bce9805ff49b9066b3b708586ed099059f053ce7..c7798d23b8db29b21e33065c08b8ebe3b7563e70 100644 (file)
@@ -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