[Libreoffice-commits] core.git: compilerplugins/clang

[Miklos Vajna (via logerrit)]

 compilerplugins/clang/flatten.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 95a0ac68413d3ed0755d8e8d5336e8f0c546bcd1
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Apr 20 09:20:44 2020 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Apr 20 10:12:45 2020 +0200

    compilerplugins: fix building against baseline clang (5.0.2)
    
    Where the Optional ctor is explicit.
    
    Change-Id: I577661c022f25502260977a6ef6744e4e178acc8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92519
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins

diff --git a/compilerplugins/clang/flatten.cxx b/compilerplugins/clang/flatten.cxx
index 00b3b1db9768..bac4ae8a4370 100644
--- a/compilerplugins/clang/flatten.cxx
+++ b/compilerplugins/clang/flatten.cxx
@@ -454,7 +454,7 @@ llvm::Optional<std::string> Flatten::invertCondition(Expr const * condExpr, Sour
                 s = "!(" + s + ")";
         }
         if (!ok)
-           return {};
+           return llvm::Optional<std::string>();
     }
     else if (auto opCallExpr = dyn_cast<CXXOperatorCallExpr>(condExpr))
     {
@@ -471,7 +471,7 @@ llvm::Optional<std::string> Flatten::invertCondition(Expr const * condExpr, Sour
                 s = "!(" + s + ")";
         }
         if (!ok)
-            return {};
+            return llvm::Optional<std::string>();
     }
     else if (isa<DeclRefExpr>(condExpr) || isa<CallExpr>(condExpr) || isa<MemberExpr>(condExpr))
         s = "!" + s;