diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-15 01:18:56 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2011-10-15 01:18:56 +0000 |
commit | 661a99690bc133bbaa029da925481d4a860dec90 (patch) | |
tree | 28ad262139c816e20a013ab8a42b602e22f2d1f3 /lib/Lex/PPExpressions.cpp | |
parent | b75a3451bcae1301875282e73a13934c90b6574c (diff) |
-Wc++98-compat warnings for the lexer.
This also adds a -Wc++98-compat-pedantic for warning on constructs which would
be diagnosed by -std=c++98 -pedantic (that is, it warns even on C++11 features
which we enable by default, with no warning, in C++98 mode).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142034 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Lex/PPExpressions.cpp')
-rw-r--r-- | lib/Lex/PPExpressions.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Lex/PPExpressions.cpp b/lib/Lex/PPExpressions.cpp index 84156d59b9..20f624a0bb 100644 --- a/lib/Lex/PPExpressions.cpp +++ b/lib/Lex/PPExpressions.cpp @@ -216,9 +216,9 @@ static bool EvaluateValue(PPValue &Result, Token &PeekTok, DefinedTracker &DT, assert(Literal.isIntegerLiteral() && "Unknown ppnumber"); // long long is a C99 feature. - if (!PP.getLangOptions().C99 && !PP.getLangOptions().CPlusPlus0x - && Literal.isLongLong) - PP.Diag(PeekTok, diag::ext_longlong); + if (!PP.getLangOptions().C99 && Literal.isLongLong) + PP.Diag(PeekTok, PP.getLangOptions().CPlusPlus0x ? + diag::warn_cxx98_compat_longlong : diag::ext_longlong); // Parse the integer literal into Result. if (Literal.GetIntegerValue(Result.Val)) { @@ -778,4 +778,3 @@ EvaluateDirectiveExpression(IdentifierInfo *&IfNDefMacro) { DisableMacroExpansion = DisableMacroExpansionAtStartOfDirective; return ResVal.Val != 0; } - |