[cfe-commits] r131692 - in /cfe/trunk: lib/Lex/PPMacroExpansion.cpp test/Lexer/has_feature_type_traits.cpp

[Sean Hunt]

Author: coppro
Date: Thu May 19 17:52:25 2011
New Revision: 131692

URL: http://llvm.org/viewvc/llvm-project?rev=131692&view=rev
Log:
Revert r131672 until __underlying_type is properly implemented in the
template case.

Modified:
    cfe/trunk/lib/Lex/PPMacroExpansion.cpp
    cfe/trunk/test/Lexer/has_feature_type_traits.cpp

Modified: cfe/trunk/lib/Lex/PPMacroExpansion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=131692&r1=131691&r2=131692&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Thu May 19 17:52:25 2011
@@ -602,7 +602,6 @@
            .Case("is_trivial", LangOpts.CPlusPlus)
            .Case("is_trivially_copyable", LangOpts.CPlusPlus)
            .Case("is_union", LangOpts.CPlusPlus)
-           .Case("underlying_type", LangOpts.CPlusPlus)
            .Case("tls", PP.getTargetInfo().isTLSSupported())
            .Default(false);
 }

Modified: cfe/trunk/test/Lexer/has_feature_type_traits.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Lexer/has_feature_type_traits.cpp?rev=131692&r1=131691&r2=131692&view=diff
==============================================================================
--- cfe/trunk/test/Lexer/has_feature_type_traits.cpp (original)
+++ cfe/trunk/test/Lexer/has_feature_type_traits.cpp Thu May 19 17:52:25 2011
@@ -99,7 +99,3 @@
 int is_trivially_copyable();
 #endif
 // CHECK: int is_trivially_copyable();
-
-#if __has_feature(underlying_type)
-int underlying_type();
-#endif