Fixed vc14 warning
authorkhizmax <libcds.dev@gmail.com>
Tue, 15 Sep 2015 19:26:42 +0000 (22:26 +0300)
committerkhizmax <libcds.dev@gmail.com>
Tue, 15 Sep 2015 19:26:42 +0000 (22:26 +0300)
cds/details/marked_ptr.h

index 01a8b1cbf474f45feefe4ddea0b82fbe71389051..dc33c4f5305e8bfefa62659d657186e9295be63f 100644 (file)
@@ -346,8 +346,8 @@ CDS_CXX11_ATOMIC_BEGIN_NAMESPACE
         atomic(const atomic&) = delete;
         atomic& operator=(const atomic&) = delete;
 
-#if !(CDS_COMPILER == CDS_COMPILER_MSVC && CDS_COMPILER_VERSION <= CDS_COMPILER_MSVC12)
-        // MSVC12: warning C4522: multiple assignment operators specified
+#if !(CDS_COMPILER == CDS_COMPILER_MSVC && CDS_COMPILER_VERSION <= CDS_COMPILER_MSVC14)
+        // MSVC12, MSVC14: warning C4522: multiple assignment operators specified
         atomic& operator=(const atomic&) volatile = delete;
         marked_ptr operator=(marked_ptr val) volatile CDS_NOEXCEPT
         {