aboutsummaryrefslogtreecommitdiff
path: root/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
commit1a1c82e1530e834cceab58fa51ff5e356e260641 (patch)
treeecff6370f3301d7fd642be1e589f58a6dda852e7 /lib
parent877761c56d850a6cc5f9246bf248c8a4dc2b0554 (diff)
Revert "[preprocessor] Don't warn about "disabled expansion of recursive macro""
This reverts commit r173952 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@173970 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/Lex/PPMacroExpansion.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index 939c4faf7a..6379144885 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/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);
}
}