<div dir="ltr"><div>Sorry, I forgot to include it in the check-in.  It's in the checkin shortly after, 188308.</div><div> </div><div>Thanks.</div><div> </div><div>-John</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
On Wed, Aug 14, 2013 at 1:43 PM, Sean Silva <span dir="ltr"><<a href="mailto:silvas@purdue.edu" target="_blank">silvas@purdue.edu</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div dir="ltr">Test case?</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Aug 13, 2013 at 11:11 AM, John Thompson <span dir="ltr"><<a href="mailto:John.Thompson.JTSoftware@gmail.com" target="_blank">John.Thompson.JTSoftware@gmail.com</a>></span> wrote:<br>

<blockquote style="margin:0px 0px 0px 0.8ex;padding-left:1ex;border-left-color:rgb(204,204,204);border-left-width:1px;border-left-style:solid" class="gmail_quote">Author: jtsoftware<br>
Date: Tue Aug 13 13:11:36 2013<br>
New Revision: 188306<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=188306&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=188306&view=rev</a><br>
Log:<br>
Avoid errors on header guards using #if defined(NAME).<br>
<br>
Modified:<br>
    clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp<br>
<br>
Modified: clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp?rev=188306&r1=188305&r2=188306&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp?rev=188306&r1=188305&r2=188306&view=diff</a><br>


==============================================================================<br>
--- clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp (original)<br>
+++ clang-tools-extra/trunk/modularize/PreprocessorTracker.cpp Tue Aug 13 13:11:36 2013<br>
@@ -962,6 +962,8 @@ public:<br>
                                  llvm::StringRef MacroUnexpanded,<br>
                                  llvm::StringRef MacroExpanded,<br>
                                  InclusionPathHandle InclusionPathHandle) {<br>
+    if (InNestedHeader)<br>
+      return;<br>
     StringHandle MacroName = addString(II->getName());<br>
     PPItemKey InstanceKey(PP, MacroName, H, InstanceLoc);<br>
     PPItemKey DefinitionKey(PP, MacroName, H, DefinitionLoc);<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</blockquote></div><br><br clear="all"><br>-- <br>John Thompson<br><a href="mailto:John.Thompson.JTSoftware@gmail.com">John.Thompson.JTSoftware@gmail.com</a><br>
</div>