From f506eaf36dd8f2c54082e8278857f2f47e90488a Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Mon, 5 Mar 2012 23:20:05 +0000
Subject: 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
---
 clang/lib/Parse/ParseDeclCXX.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'clang/lib/Parse/ParseDeclCXX.cpp')

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;
-- 
cgit v1.2.3