summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2011-04-22 23:25:09 +0000
committerChris Lattner <sabre@nondot.org>2011-04-22 23:25:09 +0000
commit9fa385d43775fb400a97a6ed85dada2f11cc0cd5 (patch)
tree1f33ed4c9dbb8c6ff53ee8862534344b311f265a
parentdcb3ebeb2c6bda8cba53d85e61281020e9e46e92 (diff)
downloadbcm5719-llvm-9fa385d43775fb400a97a6ed85dada2f11cc0cd5.tar.gz
bcm5719-llvm-9fa385d43775fb400a97a6ed85dada2f11cc0cd5.zip
don't warn about empty macro arguments in c++'0x mode, since it sucked in
the c99 preprocessor. Patch by Jonathan Sauer! llvm-svn: 130031
-rw-r--r--clang/lib/Lex/PPMacroExpansion.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index b078bc85774..f0b0fad488f 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -410,9 +410,9 @@ MacroArgs *Preprocessor::ReadFunctionLikeMacroArgs(Token &MacroName,
return 0;
}
- // Empty arguments are standard in C99 and supported as an extension in
+ // Empty arguments are standard in C99 and C++0x, and are supported as an extension in
// other modes.
- if (ArgTokens.size() == ArgTokenStart && !Features.C99)
+ if (ArgTokens.size() == ArgTokenStart && !Features.C99 && !Features.CPlusPlus0x)
Diag(Tok, diag::ext_empty_fnmacro_arg);
// Add a marker EOF token to the end of the token list for this argument.
OpenPOWER on IntegriCloud