commit 4a3012d4dd9748b18b53b90e855989d98308f990
author NAKAMURA Takumi <geek4civic@gmail.com> Thu Feb 21 02:32:34 2013 +0000
committer NAKAMURA Takumi <geek4civic@gmail.com> Thu Feb 21 02:32:34 2013 +0000
tree 07e2a396e7eb9517925158cadcdc3cb70b069a9a
parent 9f6e9106176008e91af6a974b3cf31c064d6d884

CIndex.cpp: Appease g++-4.4. "if (Optional<unsigned> Minor = In.getMinor())" did not work as expected.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@175711 91177308-0d34-0410-b5e6-96231b3b80d8

tools/libclang/CIndex.cpp

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index 669bb87..3d81660 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -5741,12 +5741,14 @@
 
   Out.Major = In.getMajor();
   
-  if (Optional<unsigned> Minor = In.getMinor())
+  Optional<unsigned> Minor = In.getMinor();
+  if (Minor.hasValue())
     Out.Minor = *Minor;
   else
     return Out;
 
-  if (Optional<unsigned> Subminor = In.getSubminor())
+  Optional<unsigned> Subminor = In.getSubminor();
+  if (Subminor.hasValue())
     Out.Subminor = *Subminor;
   
   return Out;