Fixed VC 2017 warning

[libcds.git] / cds / compiler / vc / defs.h

diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h
index 4d8540b28a12315e2d1c46c4f7bda0a48f3f10ad..4778ec5950b27dd1fab719329061d5ec874ae833 100644 (file)
--- a/cds/compiler/vc/defs.h
+++ b/cds/compiler/vc/defs.h
@@ -1,4 +1,32 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
+
+    Source code repo: http://github.com/khizmax/libcds/
+    Download: http://sourceforge.net/projects/libcds/files/
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+    CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+    OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 
 #ifndef CDSLIB_COMPILER_VC_DEFS_H
 #define CDSLIB_COMPILER_VC_DEFS_H
@@ -8,10 +36,11 @@
 #define CDS_COMPILER_VERSION    _MSC_VER
 
 // Compiler name
-// Supported compilers: MS VC 2013
+// 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_MSVC12     1800    // 2013 vc12
+#define CDS_COMPILER_MSVC14     1900    // 2015 vc14
+#define CDS_COMPILER_MSVC14_1   1910    // 2017 vc14.1
 
 #if CDS_COMPILER_VERSION < CDS_COMPILER_MSVC12
 #   error "Only MS Visual C++ 12 (2013) Update 4 and above is supported"
@@ -25,6 +54,10 @@
 #   define  CDS_COMPILER__NAME  "MS Visual C++ 2015"
 #   define  CDS_COMPILER__NICK  "vc14"
 #   define  CDS_COMPILER_LIBCDS_SUFFIX "vcv140"
+#elif _MSC_VER == 1910
+#   define  CDS_COMPILER__NAME  "MS Visual C++ 2017"
+#   define  CDS_COMPILER__NICK  "vc141"
+#   define  CDS_COMPILER_LIBCDS_SUFFIX "vcv141"
 #else
 #   define  CDS_COMPILER__NAME  "MS Visual C++"
 #   define  CDS_COMPILER__NICK  "msvc"
@@ -65,8 +98,6 @@
 
 #define  __attribute__( _x )
 
-#define  CDS_STDCALL    __stdcall
-
 #ifdef CDS_BUILD_LIB
 #   define CDS_EXPORT_API          __declspec(dllexport)
 #else
@@ -120,9 +151,9 @@
 // *************************************************
 // Alignment macro
 
-#define CDS_TYPE_ALIGNMENT(n)     __declspec( align(n) )
-#define CDS_DATA_ALIGNMENT(n)     __declspec( align(n) )
-#define CDS_CLASS_ALIGNMENT(n)    __declspec( align(n) )
+#define CDS_TYPE_ALIGNMENT(n)     __declspec( align(n))
+#define CDS_DATA_ALIGNMENT(n)     __declspec( align(n))
+#define CDS_CLASS_ALIGNMENT(n)    __declspec( align(n))
 
 // Attributes
 #if CDS_COMPILER_VERSION >= CDS_COMPILER_MSVC14
@@ -131,6 +162,27 @@
 #   define CDS_DEPRECATED( reason ) __declspec(deprecated( reason ))
 #endif
 
+#define CDS_NORETURN __declspec(noreturn)
+
+// Exceptions
+
+#if defined( _CPPUNWIND )
+#   define CDS_EXCEPTION_ENABLED
+#endif
+
+
+// double-width CAS support
+//#define CDS_DCAS_SUPPORT
+
+// Byte order
+//  It seems, MSVC works only on little-endian architecture?..
+#if !defined(CDS_ARCH_LITTLE_ENDIAN) && !defined(CDS_ARCH_BIG_ENDIAN)
+#   define CDS_ARCH_LITTLE_ENDIAN
+#endif
+
+// Sanitizer attributes (not supported)
+#define CDS_SUPPRESS_SANITIZE( ... )
+
 #include <cds/compiler/vc/compiler_barriers.h>
 
 //@endcond