diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-05 23:20:05 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-05 23:20:05 +0000 |
| commit | f506eaf36dd8f2c54082e8278857f2f47e90488a (patch) | |
| tree | 080029d3c68dde45ab111e34e3a07515ef216d1e /clang/lib/Parse/ParseDeclCXX.cpp | |
| parent | 8dc347fc270cf063fb3368b39d140b2664ee9b46 (diff) | |
| download | bcm5719-llvm-f506eaf36dd8f2c54082e8278857f2f47e90488a.tar.gz bcm5719-llvm-f506eaf36dd8f2c54082e8278857f2f47e90488a.zip | |
static_assert: Allow any string-literal as the message, not just a character
string literal, and adjust the diagnostic code to match. This also causes us
to escape any control characters in the message.
llvm-svn: 152069
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDeclCXX.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index 983bd7ee152..978b2b362d1 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -610,7 +610,7 @@ Decl *Parser::ParseStaticAssertDeclaration(SourceLocation &DeclEnd){ if (ExpectAndConsume(tok::comma, diag::err_expected_comma, "", tok::semi)) return 0; - if (Tok.isNot(tok::string_literal)) { + if (!isTokenStringLiteral()) { Diag(Tok, diag::err_expected_string_literal); SkipUntil(tok::semi); return 0; |
