diff options
| -rw-r--r-- | clang/lib/Lex/Lexer.cpp | 3 | ||||
| -rw-r--r-- | clang/lib/Lex/LiteralSupport.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Lexer/hexfloat.cpp | 9 |
3 files changed, 3 insertions, 12 deletions
diff --git a/clang/lib/Lex/Lexer.cpp b/clang/lib/Lex/Lexer.cpp index c7a3df50bca..802024f79b6 100644 --- a/clang/lib/Lex/Lexer.cpp +++ b/clang/lib/Lex/Lexer.cpp @@ -1358,8 +1358,7 @@ void Lexer::LexNumericConstant(Token &Result, const char *CurPtr) { } // If we have a hex FP constant, continue. - if ((C == '-' || C == '+') && (PrevCh == 'P' || PrevCh == 'p') && - !Features.CPlusPlus0x) + if ((C == '-' || C == '+') && (PrevCh == 'P' || PrevCh == 'p')) return LexNumericConstant(Result, ConsumeChar(CurPtr, Size, Result)); // Update the location of token as well as BufferPtr. diff --git a/clang/lib/Lex/LiteralSupport.cpp b/clang/lib/Lex/LiteralSupport.cpp index 96550e6492b..70183fd1a0e 100644 --- a/clang/lib/Lex/LiteralSupport.cpp +++ b/clang/lib/Lex/LiteralSupport.cpp @@ -562,9 +562,6 @@ void NumericLiteralParser::ParseNumberStartingWithZero(SourceLocation TokLoc) { } s = first_non_digit; - // In C++0x, we cannot support hexadecmial floating literals because - // they conflict with user-defined literals, so we warn in previous - // versions of C++ by default. if (!PP.getLangOptions().HexFloats) PP.Diag(TokLoc, diag::ext_hexconstant_invalid); } else if (saw_period) { diff --git a/clang/test/Lexer/hexfloat.cpp b/clang/test/Lexer/hexfloat.cpp index 493b64e6274..23daa49ad21 100644 --- a/clang/test/Lexer/hexfloat.cpp +++ b/clang/test/Lexer/hexfloat.cpp @@ -1,9 +1,4 @@ // RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s -// RUN: %clang_cc1 -std=c++0x -fsyntax-only -verify %s -// XFAIL: * +// RUN: %clang_cc1 -std=c++11 -fsyntax-only -verify -pedantic %s +float f = 0x1p+1; // expected-warning{{hexadecimal floating constants are a C99 feature}} -#ifndef __GXX_EXPERIMENTAL_CXX0X__ -float f = 0x1p+1; // expected-warning {{incompatible with C++0x}} -#else -float f = 0x1p+1; // expected-warning {{invalid suffix}} -#endif |
