[llvm] r204973 - Revert "[C++11] Do not check __GXX_EXPERIMENTAL_CXX0X__."

Rui Ueyama ruiu at google.com
Thu Mar 27 15:36:06 PDT 2014


Author: ruiu
Date: Thu Mar 27 17:36:06 2014
New Revision: 204973

URL: http://llvm.org/viewvc/llvm-project?rev=204973&view=rev
Log:
Revert "[C++11] Do not check __GXX_EXPERIMENTAL_CXX0X__."

This reverts commit r204964 because it disabled "= delete", "constexpr"
and "explicit" on GCC.

Modified:
    llvm/trunk/include/llvm/Support/Compiler.h

Modified: llvm/trunk/include/llvm/Support/Compiler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Compiler.h?rev=204973&r1=204972&r2=204973&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Compiler.h (original)
+++ llvm/trunk/include/llvm/Support/Compiler.h Thu Mar 27 17:36:06 2014
@@ -104,13 +104,14 @@
 /// public:
 ///   ...
 /// };
-#if __has_feature(cxx_deleted_functions) || LLVM_MSC_PREREQ(1800)
+#if __has_feature(cxx_deleted_functions) || \
+    defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1800)
 #define LLVM_DELETED_FUNCTION = delete
 #else
 #define LLVM_DELETED_FUNCTION
 #endif
 
-#if __has_feature(cxx_constexpr)
+#if __has_feature(cxx_constexpr) || defined(__GXX_EXPERIMENTAL_CXX0X__)
 # define LLVM_CONSTEXPR constexpr
 #else
 # define LLVM_CONSTEXPR
@@ -325,7 +326,8 @@
 /// \macro LLVM_EXPLICIT
 /// \brief Expands to explicit on compilers which support explicit conversion
 /// operators. Otherwise expands to nothing.
-#if __has_feature(cxx_explicit_conversions) || LLVM_MSC_PREREQ(1800)
+#if __has_feature(cxx_explicit_conversions) || \
+    defined(__GXX_EXPERIMENTAL_CXX0X__) || LLVM_MSC_PREREQ(1800)
 #define LLVM_EXPLICIT explicit
 #else
 #define LLVM_EXPLICIT





More information about the llvm-commits mailing list