X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cds%2Fcompiler%2Fvc%2Fdefs.h;h=1b00f6ff8df580a67b57daf3f6a968e3b096378d;hb=109dabde47396bc0d73d67c635b808ec8f8efbae;hp=596a7a3d7a6bf068049872c5de833e8922591603;hpb=677119b93c6eff63ed955679dff21973e9efd9f9;p=libcds.git

diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h
index 596a7a3d..1b00f6ff 100644
--- 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-2016
+
+    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
@@ -120,12 +148,19 @@
 // *************************************************
 // 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
-#define CDS_DEPRECATED( reason ) __declspec(deprecated( reason ))
+#if CDS_COMPILER_VERSION >= CDS_COMPILER_MSVC14
+#   define CDS_DEPRECATED( reason ) [[deprecated( reason )]]
+#else
+#   define CDS_DEPRECATED( reason ) __declspec(deprecated( reason ))
+#endif
+
+// double-width CAS support
+//#define CDS_DCAS_SUPPORT
 
 #include <cds/compiler/vc/compiler_barriers.h>