summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorTim Northover <tnorthover@apple.com>2017-08-08 23:17:51 +0000
committerTim Northover <tnorthover@apple.com>2017-08-08 23:17:51 +0000
commitd1fafc8b0569b1cef000e1063657e2752f41ecb4 (patch)
treedcbd9648de59e25bccb8b201d6ed11f220501dc6 /clang/lib
parent8dd90fb54b2b0c1fd0209ecbbd78c242863e2aa8 (diff)
downloadbcm5719-llvm-d1fafc8b0569b1cef000e1063657e2752f41ecb4.tar.gz
bcm5719-llvm-d1fafc8b0569b1cef000e1063657e2752f41ecb4.zip
Revert "Lexer: always allow imaginary constants in GNU mode."
This reverts r310423. It was committed by mistake, I intended to commit the improved diagnostics for implicit conversions instead. llvm-svn: 310426
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Lex/LiteralSupport.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Lex/LiteralSupport.cpp b/clang/lib/Lex/LiteralSupport.cpp
index 52b259edce8..a598a467816 100644
--- a/clang/lib/Lex/LiteralSupport.cpp
+++ b/clang/lib/Lex/LiteralSupport.cpp
@@ -659,7 +659,7 @@ NumericLiteralParser::NumericLiteralParser(StringRef TokSpelling,
}
}
// "i", "if", and "il" are user-defined suffixes in C++1y.
- if (*s == 'i' && !PP.getLangOpts().GNUMode)
+ if (*s == 'i' && PP.getLangOpts().CPlusPlus14)
break;
// fall through.
case 'j':
OpenPOWER on IntegriCloud