summaryrefslogtreecommitdiffstats
path: root/clang/lib/Lex/PPDirectives.cpp
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2011-08-22 18:48:28 +0000
committerEli Friedman <eli.friedman@gmail.com>2011-08-22 18:48:28 +0000
commit4acfbcd918519a56cb4b2dff5f31ea7d989404ab (patch)
tree8c029c44d5d74bd90a9e554b063a5325bfbb4f1c /clang/lib/Lex/PPDirectives.cpp
parent3aaed0a14cc63479fe895567e030b896f2e494f1 (diff)
downloadbcm5719-llvm-4acfbcd918519a56cb4b2dff5f31ea7d989404ab.tar.gz
bcm5719-llvm-4acfbcd918519a56cb4b2dff5f31ea7d989404ab.zip
Don't warn on varaidic macros in C++0x mode.
llvm-svn: 138257
Diffstat (limited to 'clang/lib/Lex/PPDirectives.cpp')
-rw-r--r--clang/lib/Lex/PPDirectives.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp
index 383c6f5aa16..39a358d976e 100644
--- a/clang/lib/Lex/PPDirectives.cpp
+++ b/clang/lib/Lex/PPDirectives.cpp
@@ -1298,8 +1298,8 @@ bool Preprocessor::ReadMacroDefinitionArgList(MacroInfo *MI) {
Diag(Tok, diag::err_pp_expected_ident_in_arg_list);
return true;
case tok::ellipsis: // #define X(... -> C99 varargs
- // Warn if use of C99 feature in non-C99 mode.
- if (!Features.C99) Diag(Tok, diag::ext_variadic_macro);
+ if (!Features.C99 && !Features.CPlusPlus0x)
+ Diag(Tok, diag::ext_variadic_macro);
// Lex the token after the identifier.
LexUnexpandedToken(Tok);
OpenPOWER on IntegriCloud