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 471a905d9f027e41a2b998b31e02e4b156e1fd48..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,53 +20,29 @@
 
 #include <cds/compiler/gcc/compiler_macro.h>
 
-
 #define alignof __alignof__
 
 // ***************************************
 // C++11 features
 
-#define CDS_CXX11_VARIADIC_TEMPLATE_SUPPORT
-
-// RValue
-#define CDS_RVALUE_SUPPORT
-#define CDS_MOVE_SEMANTICS_SUPPORT
-
-#define CDS_CXX11_DEFAULT_FUNCTION_TEMPLATE_ARGS_SUPPORT
-
 // C++11 inline namespace
 #define CDS_CXX11_INLINE_NAMESPACE_SUPPORT
 
-// C++11 delete definition ( function declaration = delete)
-#define CDS_CXX11_DELETE_DEFINITION_SUPPORT
-
-// C++11 explicitly-defaulted function (= default) [std 8.4.2 [dcl.fct.def.default]]
-#define CDS_CXX11_EXPLICITLY_DEFAULTED_FUNCTION_SUPPORT
-
-// Lambda
-#define CDS_CXX11_LAMBDA_SUPPORT
-
-// Explicit conversion operator
-#define CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_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 template alias
-#define CDS_CXX11_TEMPLATE_ALIAS_SUPPORT
 
 // C++11 thread_local keyword
 #define CDS_CXX11_THREAD_LOCAL_SUPPORT
 
 // Full SFINAE support
-#if CDS_COMPILER_VERSION >= 40700
-#   define CDS_CXX11_SFINAE
-#endif
+#define CDS_CXX11_SFINAE
+
+// Inheriting constructors
+#define CDS_CXX11_INHERITING_CTOR
 
 // *************************************************
 // Alignment macro
@@ -78,4 +54,4 @@
 
 #include <cds/compiler/gcc/compiler_barriers.h>
 
-#endif // #ifndef __CDS_COMPILER_GCC_DEFS_H
+#endif // #ifndef CDSLIB_COMPILER_GCC_DEFS_H