[clang-tools-extra] r188306 - Avoid errors on header guards using #if defined(NAME).

[John Thompson]

Author: jtsoftware
Date: Tue Aug 13 13:11:36 2013
New Revision: 188306

URL: http://llvm.org/viewvc/llvm-project?rev=188306&view=rev
Log:
Avoid errors on header guards using #if defined(NAME).

Modified:
    clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp

Modified: clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp
URL: 
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp?rev=188306&r1=188305&r2=188306&view=diff
==============================================================================
--- clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp (original)
+++ clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp Tue Aug 13 
13:11:36 2013
@@ -962,6 +962,8 @@ public:
                                  llvm::StringRef MacroUnexpanded,
                                  llvm::StringRef MacroExpanded,
                                  InclusionPathHandle InclusionPathHandle) {
+    if (InNestedHeader)
+      return;
     StringHandle MacroName = addString(II->getName());
     PPItemKey InstanceKey(PP, MacroName, H, InstanceLoc);
     PPItemKey DefinitionKey(PP, MacroName, H, DefinitionLoc);


_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits