summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>2013-01-30 20:42:17 +0000
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>2013-01-30 20:42:17 +0000
commita94bd438f8ddc3013b5122d2ba1648ce5a428df0 (patch)
tree047abd96efcb1901e2797e0398cbdfefdcf5b992 /clang/lib
parent1330eccb5f8efd0bf6b272d8241326a3a4780e30 (diff)
downloadbcm5719-llvm-a94bd438f8ddc3013b5122d2ba1648ce5a428df0.tar.gz
bcm5719-llvm-a94bd438f8ddc3013b5122d2ba1648ce5a428df0.zip
Revert "[preprocessor] Don't warn about "disabled expansion of recursive macro""
This reverts commit r173952 llvm-svn: 173970
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Lex/PPMacroExpansion.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index 939c4faf7a0..63791448858 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -459,10 +459,7 @@ bool Preprocessor::HandleMacroExpandedIdentifier(Token &Identifier,
if (MacroInfo *NewMI = getMacroInfo(NewII))
if (!NewMI->isEnabled() || NewMI == MI) {
Identifier.setFlag(Token::DisableExpand);
- // Don't warn for "#define X X" like "#define bool bool" from
- // stdbool.h.
- if (NewMI != MI)
- Diag(Identifier, diag::pp_disabled_macro_expansion);
+ Diag(Identifier, diag::pp_disabled_macro_expansion);
}
}
OpenPOWER on IntegriCloud