From: Adrian Prantl <aprantl@apple.com>
Date: Mon, 22 Apr 2019 22:51:34 +0000 (+0000)
Subject: Fully qualify llvm::Optional, some compilers complain otherwise.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a550ed7e780ae49a20553f0c21118117305d22a5;p=llvm

Fully qualify llvm::Optional, some compilers complain otherwise.

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

diff --git a/tools/dsymutil/dsymutil.cpp b/tools/dsymutil/dsymutil.cpp
index 0eb1257d98d..32569846361 100644
--- a/tools/dsymutil/dsymutil.cpp
+++ b/tools/dsymutil/dsymutil.cpp
@@ -280,12 +280,13 @@ static bool verify(llvm::StringRef OutputFile, llvm::StringRef Arch) {
 
 namespace {
 struct OutputLocation {
-  OutputLocation(std::string DWARFFile, Optional<std::string> ResourceDir = {})
+  OutputLocation(std::string DWARFFile,
+                 llvm::Optional<std::string> ResourceDir = {})
       : DWARFFile(DWARFFile), ResourceDir(ResourceDir) {}
   /// This method is a workaround for older compilers.
-  Optional<std::string> getResourceDir() const { return ResourceDir; }
+  llvm::Optional<std::string> getResourceDir() const { return ResourceDir; }
   std::string DWARFFile;
-  Optional<std::string> ResourceDir;
+  llvm::Optional<std::string> ResourceDir;
 };
 }