<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Feb 20, 2013 at 6:32 PM, NAKAMURA Takumi <span dir="ltr"><<a href="mailto:geek4civic@gmail.com" target="_blank">geek4civic@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: chapuni<br>
Date: Wed Feb 20 20:32:34 2013<br>
New Revision: 175711<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=175711&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=175711&view=rev</a><br>
Log:<br>
CIndex.cpp: Appease g++-4.4. "if (Optional<unsigned> Minor = In.getMinor())" did not work as expected.<br></blockquote><div><br></div><div style>Thanks for the fix - could you explain how it broke? (I looked at a few bot logs but couldn't quite figure it out)<br>
<br>Would be useful to know because there's many other examples of similar code (declaring Optionals in if conditions)</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">

<br>
Modified:<br>
    cfe/trunk/tools/libclang/CIndex.cpp<br>
<br>
Modified: cfe/trunk/tools/libclang/CIndex.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=175711&r1=175710&r2=175711&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndex.cpp?rev=175711&r1=175710&r2=175711&view=diff</a><br>

==============================================================================<br>
--- cfe/trunk/tools/libclang/CIndex.cpp (original)<br>
+++ cfe/trunk/tools/libclang/CIndex.cpp Wed Feb 20 20:32:34 2013<br>
@@ -5741,12 +5741,14 @@ static CXVersion convertVersion(VersionT<br>
<br>
   Out.Major = In.getMajor();<br>
<br>
-  if (Optional<unsigned> Minor = In.getMinor())<br>
+  Optional<unsigned> Minor = In.getMinor();<br>
+  if (Minor.hasValue())<br>
     Out.Minor = *Minor;<br>
   else<br>
     return Out;<br>
<br>
-  if (Optional<unsigned> Subminor = In.getSubminor())<br>
+  Optional<unsigned> Subminor = In.getSubminor();<br>
+  if (Subminor.hasValue())<br>
     Out.Subminor = *Subminor;<br>
<br>
   return Out;<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">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></div>