From: khizmax <libcds.dev@gmail.com>
Date: Tue, 15 Sep 2015 19:26:42 +0000 (+0300)
Subject: Fixed vc14 warning
X-Git-Tag: v2.1.0~111
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ceff05e5bcb13c97992405568983093e12e83d0b;p=libcds.git

Fixed vc14 warning
---

diff --git a/cds/details/marked_ptr.h b/cds/details/marked_ptr.h
index 01a8b1cb..dc33c4f5 100644
--- a/cds/details/marked_ptr.h
+++ b/cds/details/marked_ptr.h
@@ -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
         {