Changed library name for MSVC++

Fixed warnings for MS VC 15.3 (C++ toolset has been changed in 15.3)

diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h
index 4778ec5950b27dd1fab719329061d5ec874ae833..d84d2e83ed8d11adc5d178b8989fec92ffa21108 100644 (file)
--- a/cds/compiler/vc/defs.h
+++ b/cds/compiler/vc/defs.h
@@ -38,9 +38,11 @@
 // Compiler name
 // Supported compilers: MS VC 2013 +
 // C++ compiler versions:
-#define CDS_COMPILER_MSVC12     1800    // 2013 vc12
-#define CDS_COMPILER_MSVC14     1900    // 2015 vc14
-#define CDS_COMPILER_MSVC14_1   1910    // 2017 vc14.1
+#define CDS_COMPILER_MSVC12         1800    // 2013 vc12
+#define CDS_COMPILER_MSVC14         1900    // 2015 vc14
+#define CDS_COMPILER_MSVC14_1       1910    // 2017 vc14.1
+#define CDS_COMPILER_MSVC14_1_3     1911    // 2017 vc14.1 (VS 15.3)
+#define CDS_COMPILER_MSVC15         2000    // next Visual Studio
 
 #if CDS_COMPILER_VERSION < CDS_COMPILER_MSVC12
 #   error "Only MS Visual C++ 12 (2013) Update 4 and above is supported"
@@ -54,7 +56,7 @@
 #   define  CDS_COMPILER__NAME  "MS Visual C++ 2015"
 #   define  CDS_COMPILER__NICK  "vc14"
 #   define  CDS_COMPILER_LIBCDS_SUFFIX "vcv140"
-#elif _MSC_VER == 1910
+#elif _MSC_VER < 2000 
 #   define  CDS_COMPILER__NAME  "MS Visual C++ 2017"
 #   define  CDS_COMPILER__NICK  "vc141"
 #   define  CDS_COMPILER_LIBCDS_SUFFIX "vcv141"

diff --git a/cds/details/lib.h b/cds/details/lib.h
index 08b7f64736a7b6559535288858773707a1fe9b5c..6f96b3ecf8680fb4f1ad32c197bbd48aeddb778d 100644 (file)
--- a/cds/details/lib.h
+++ b/cds/details/lib.h
@@ -37,16 +37,12 @@
 #ifndef CDS_BUILD_LIB
 
 #ifdef _DEBUG
-#   define  CDS_LIB_DEBUG_SUFFIX "_debug"
+#   define  CDS_LIB_DEBUG_SUFFIX "-dbg"
 #else
 #   define  CDS_LIB_DEBUG_SUFFIX ""
 #endif
 
-#if CDS_COMPILER == CDS_COMPILER_MSVC
-#   pragma comment( lib, "libcds-" CDS_PROCESSOR__NICK "-" CDS_COMPILER_LIBCDS_SUFFIX CDS_LIB_DEBUG_SUFFIX )
-#elif CDS_COMPILER == CDS_COMPILER_INTEL
-#   pragma comment( lib, "libcds-" CDS_PROCESSOR__NICK "-" CDS_COMPILER__NICK CDS_LIB_DEBUG_SUFFIX )
-#endif
+#pragma comment( lib, "libcds-" CDS_PROCESSOR__NICK CDS_LIB_DEBUG_SUFFIX )
 
 #undef CDS_LIB_DEBUG_SUFFIX
 

diff --git a/cds/details/marked_ptr.h b/cds/details/marked_ptr.h
index 2a53c34cfec2ee153cef87659d730e0e7ca20d26..ba0bf3708512b69197c23a1ba9cb251c8b3e58f8 100644 (file)
--- a/cds/details/marked_ptr.h
+++ b/cds/details/marked_ptr.h
@@ -374,7 +374,7 @@ 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_MSVC14_1)
+#if !(CDS_COMPILER == CDS_COMPILER_MSVC && CDS_COMPILER_VERSION < CDS_COMPILER_MSVC15)
         // MSVC12, MSVC14, MSVC14.1: warning C4522: multiple assignment operators specified
         atomic& operator=(const atomic&) volatile = delete;
         marked_ptr operator=(marked_ptr val) volatile CDS_NOEXCEPT

diff --git a/projects/Win/vc141/cds.vcxproj b/projects/Win/vc141/cds.vcxproj
index ace327b5e4ce8842b4c40b7995098ccf91bc88c4..3eff90218a957d2faee2f25bf151e977ce3d11d3 100644 (file)
--- a/projects/Win/vc141/cds.vcxproj
+++ b/projects/Win/vc141/cds.vcxproj
@@ -139,12 +139,12 @@
     <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
     <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libcds-x86-vc$(PlatformToolset)_debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">libcds-x86-vc$(PlatformToolset)_debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libcds-x86-vc$(PlatformToolset)</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libcds-amd64-vc$(PlatformToolset)_debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">libcds-amd64-vc$(PlatformToolset)_debug</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libcds-amd64-vc$(PlatformToolset)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libcds-x86-dbg</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">libcds-x86-dbg</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libcds-x86</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libcds-amd64-dbg</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugVLD|x64'">libcds-amd64-dbg</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libcds-amd64</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>