Major merge from 'dev'

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

diff --git a/cds/compiler/gcc/defs.h b/cds/compiler/gcc/defs.h
index de34765a6c55a9a067ba9d44d82c26de9333d0cb..2dadc6e1edb93544ce4a79bb442d7c21d7b64c47 100644 (file)
--- a/cds/compiler/gcc/defs.h
+++ b/cds/compiler/gcc/defs.h
@@ -1,7 +1,7 @@
 //$$CDS-header$$
 
-#ifndef __CDS_COMPILER_GCC_DEFS_H
-#define __CDS_COMPILER_GCC_DEFS_H
+#ifndef CDSLIB_COMPILER_GCC_DEFS_H
+#define CDSLIB_COMPILER_GCC_DEFS_H
 
 // Compiler version
 #define CDS_COMPILER_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
@@ -20,7 +20,6 @@
 
 #include <cds/compiler/gcc/compiler_macro.h>
 
-
 #define alignof __alignof__
 
 // ***************************************
@@ -29,16 +28,12 @@
 // C++11 inline namespace
 #define CDS_CXX11_INLINE_NAMESPACE_SUPPORT
 
-// Lambda
-#define CDS_CXX11_LAMBDA_SUPPORT
-
 // constexpr
 #define CDS_CONSTEXPR    constexpr
 
 // noexcept
 #define CDS_NOEXCEPT_SUPPORT        noexcept
 #define CDS_NOEXCEPT_SUPPORT_(expr) noexcept(expr)
-#define CDS_CONSTEXPR_CONST constexpr const
 
 // C++11 thread_local keyword
 #define CDS_CXX11_THREAD_LOCAL_SUPPORT
@@ -46,6 +41,9 @@
 // Full SFINAE support
 #define CDS_CXX11_SFINAE
 
+// Inheriting constructors
+#define CDS_CXX11_INHERITING_CTOR
+
 // *************************************************
 // Alignment macro
 
@@ -56,4 +54,4 @@
 
 #include <cds/compiler/gcc/compiler_barriers.h>
 
-#endif // #ifndef __CDS_COMPILER_GCC_DEFS_H
+#endif // #ifndef CDSLIB_COMPILER_GCC_DEFS_H