diff options
| author | David Majnemer <david.majnemer@gmail.com> | 2016-05-24 17:21:42 +0000 |
|---|---|---|
| committer | David Majnemer <david.majnemer@gmail.com> | 2016-05-24 17:21:42 +0000 |
| commit | 806a7663cd683bde68837e1cf46e26dd5cc6110f (patch) | |
| tree | 31fc492e54df56272ab8291c623b590e94077e00 /lib/Lex/PPMacroExpansion.cpp | |
| parent | 0e3b73c5cf0bf89bb96412d1d88e54bf285d36a0 (diff) | |
Revert "[Lex] Support more type-traits in __has_feature"
This reverts commit r270580. Using __has_feature to test for
type-traits is deprecated.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@270583 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/PPMacroExpansion.cpp')
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 130744fe2b..a4734a2812 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -1187,37 +1187,29 @@ static bool HasFeature(const Preprocessor &PP, StringRef Feature) { // FIXME: Should this be __has_feature or __has_extension? //.Case("raw_invocation_type", LangOpts.CPlusPlus) // Type traits + // N.B. Additional type traits should not be added to the following list. + // Instead, they should be detected by has_extension. .Case("has_nothrow_assign", LangOpts.CPlusPlus) .Case("has_nothrow_copy", LangOpts.CPlusPlus) .Case("has_nothrow_constructor", LangOpts.CPlusPlus) .Case("has_trivial_assign", LangOpts.CPlusPlus) - .Case("has_trivial_move_assign", LangOpts.CPlusPlus) .Case("has_trivial_copy", LangOpts.CPlusPlus) .Case("has_trivial_constructor", LangOpts.CPlusPlus) - .Case("has_trivial_move_constructor", LangOpts.CPlusPlus) .Case("has_trivial_destructor", LangOpts.CPlusPlus) .Case("has_virtual_destructor", LangOpts.CPlusPlus) .Case("is_abstract", LangOpts.CPlusPlus) - .Case("is_assignable", LangOpts.CPlusPlus) .Case("is_base_of", LangOpts.CPlusPlus) .Case("is_class", LangOpts.CPlusPlus) .Case("is_constructible", LangOpts.CPlusPlus) .Case("is_convertible_to", LangOpts.CPlusPlus) - .Case("is_destructible", - LangOpts.CPlusPlus &&LangOpts.MicrosoftExt) .Case("is_empty", LangOpts.CPlusPlus) .Case("is_enum", LangOpts.CPlusPlus) .Case("is_final", LangOpts.CPlusPlus) .Case("is_literal", LangOpts.CPlusPlus) - .Case("is_nothrow_assignable", LangOpts.CPlusPlus) - .Case("is_nothrow_constructible", LangOpts.CPlusPlus) - .Case("is_nothrow_destructible", - LangOpts.CPlusPlus && LangOpts.MicrosoftExt) + .Case("is_standard_layout", LangOpts.CPlusPlus) .Case("is_pod", LangOpts.CPlusPlus) .Case("is_polymorphic", LangOpts.CPlusPlus) - .Case("is_sealed", - LangOpts.CPlusPlus && LangOpts.MicrosoftExt) - .Case("is_standard_layout", LangOpts.CPlusPlus) + .Case("is_sealed", LangOpts.CPlusPlus && LangOpts.MicrosoftExt) .Case("is_trivial", LangOpts.CPlusPlus) .Case("is_trivially_assignable", LangOpts.CPlusPlus) .Case("is_trivially_constructible", LangOpts.CPlusPlus) |