From 12edfa767441547926e94646aeaa00fb967e6da7 Mon Sep 17 00:00:00 2001 From: khizmax Date: Tue, 23 Sep 2014 17:25:06 +0400 Subject: [PATCH] Remove CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT macro and emulating code --- cds/compiler/clang/defs.h | 3 --- cds/compiler/defs.h | 1 + cds/compiler/gcc/defs.h | 3 --- cds/compiler/icl/defs.h | 5 ----- cds/compiler/vc/defs.h | 3 --- 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/cds/compiler/clang/defs.h b/cds/compiler/clang/defs.h index 9ca62d89..5438396c 100644 --- a/cds/compiler/clang/defs.h +++ b/cds/compiler/clang/defs.h @@ -37,9 +37,6 @@ // C++11 explicitly-defaulted function (= default) [std 8.4.2 [dcl.fct.def.default]] #define CDS_CXX11_EXPLICITLY_DEFAULTED_FUNCTION_SUPPORT -// Explicit conversion operators -#define CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT - // C++11 inline namespace #define CDS_CXX11_INLINE_NAMESPACE_SUPPORT diff --git a/cds/compiler/defs.h b/cds/compiler/defs.h index a373fbcc..315ff626 100644 --- a/cds/compiler/defs.h +++ b/cds/compiler/defs.h @@ -6,6 +6,7 @@ /* Required C++11 features: - template alias [CDS_CXX11_TEMPLATE_ALIAS_SUPPORT] + - explicit conversion operator [CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT] */ #if CDS_COMPILER == CDS_COMPILER_MSVC diff --git a/cds/compiler/gcc/defs.h b/cds/compiler/gcc/defs.h index 2bfacc06..2e6dc49a 100644 --- a/cds/compiler/gcc/defs.h +++ b/cds/compiler/gcc/defs.h @@ -46,9 +46,6 @@ // Lambda #define CDS_CXX11_LAMBDA_SUPPORT -// Explicit conversion operator -#define CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT - // constexpr #define CDS_CONSTEXPR constexpr diff --git a/cds/compiler/icl/defs.h b/cds/compiler/icl/defs.h index 1037ba07..b32550a8 100644 --- a/cds/compiler/icl/defs.h +++ b/cds/compiler/icl/defs.h @@ -106,11 +106,6 @@ // C++11 inline namespace #define CDS_CXX11_INLINE_NAMESPACE_SUPPORT -// Explicit conversion operator -//#if CDS_COMPILER_VERSION >= 1800 -//# define CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT -//#endif - // ************************************************* // Alignment macro diff --git a/cds/compiler/vc/defs.h b/cds/compiler/vc/defs.h index 59a33d03..080827e1 100644 --- a/cds/compiler/vc/defs.h +++ b/cds/compiler/vc/defs.h @@ -109,9 +109,6 @@ // C++11 inline namespace //#define CDS_CXX11_INLINE_NAMESPACE_SUPPORT -// Explicit conversion operator (VC12+) -#define CDS_CXX11_EXPLICIT_CONVERSION_OPERATOR_SUPPORT - #if CDS_COMPILER_VERSION == CDS_COMPILER_MSVC12 // VC12: move ctor cannot be defaulted // Error: C2610 [move ctor] is not a special member function which can be defaulted -- 2.34.1