diff options
| author | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-19 22:52:25 +0000 |
|---|---|---|
| committer | Sean Hunt <scshunt@csclub.uwaterloo.ca> | 2011-05-19 22:52:25 +0000 |
| commit | d1aab5be8b24f5a65f6448be27020c453ec89019 (patch) | |
| tree | 515dda52981042e84c007fb0906e615e0bc115d6 | |
| parent | dca3973d4a92f9cd681408964fb705c6f66becd7 (diff) | |
Revert r131672 until __underlying_type is properly implemented in the
template case.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@131692 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 1 | ||||
| -rw-r--r-- | test/Lexer/has_feature_type_traits.cpp | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 5315279f9a..6a9d4abef1 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -602,7 +602,6 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { .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); } diff --git a/test/Lexer/has_feature_type_traits.cpp b/test/Lexer/has_feature_type_traits.cpp index f46165de3f..5da845f065 100644 --- a/test/Lexer/has_feature_type_traits.cpp +++ b/test/Lexer/has_feature_type_traits.cpp @@ -99,7 +99,3 @@ int is_standard_layout(); int is_trivially_copyable(); #endif // CHECK: int is_trivially_copyable(); - -#if __has_feature(underlying_type) -int underlying_type(); -#endif |