diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-02-21 02:32:34 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2013-02-21 02:32:34 +0000 |
| commit | c2b5d1f9b9164bd25fe64003b4573bf2a74cbb6d (patch) | |
| tree | e89027747c31ce90c94ef72b17f5680a053e3c79 | |
| parent | 8c5d3888501993315e36260e501ad34786d2ba86 (diff) | |
| download | bcm5719-llvm-c2b5d1f9b9164bd25fe64003b4573bf2a74cbb6d.tar.gz bcm5719-llvm-c2b5d1f9b9164bd25fe64003b4573bf2a74cbb6d.zip | |
CIndex.cpp: Appease g++-4.4. "if (Optional<unsigned> Minor = In.getMinor())" did not work as expected.
llvm-svn: 175711
| -rw-r--r-- | clang/tools/libclang/CIndex.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/clang/tools/libclang/CIndex.cpp b/clang/tools/libclang/CIndex.cpp index 669bb8722e1..3d81660b4d3 100644 --- a/clang/tools/libclang/CIndex.cpp +++ b/clang/tools/libclang/CIndex.cpp @@ -5741,12 +5741,14 @@ static CXVersion convertVersion(VersionTuple In) { 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; |
