From: Haojian Wu <hokein@google.com>
Date: Wed, 14 Nov 2018 09:42:28 +0000 (+0000)
Subject: Fix the "make_unique is ambiguous" compiler error.
X-Git-Tag: llvmorg-8.0.0-rc1~4312
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=01b098840f9934af90376fe1a015a9be80c067fb;p=platform%2Fupstream%2Fllvm.git

Fix the "make_unique is ambiguous" compiler error.

llvm-svn: 346839
---

diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 31968de..e1be28e 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -169,8 +169,8 @@ public:
         GetDirectory().CopyByAppendingPathComponent("gdb-remote.yaml");
 
     std::error_code EC;
-    m_stream_up = make_unique<raw_fd_ostream>(history_file.GetPath(), EC,
-                                              sys::fs::OpenFlags::F_None);
+    m_stream_up = llvm::make_unique<raw_fd_ostream>(history_file.GetPath(), EC,
+                                                    sys::fs::OpenFlags::F_None);
     return m_stream_up.get();
   }
 
diff --git a/lldb/source/Utility/Reproducer.cpp b/lldb/source/Utility/Reproducer.cpp
index 9da1723..5b8480f 100644
--- a/lldb/source/Utility/Reproducer.cpp
+++ b/lldb/source/Utility/Reproducer.cpp
@@ -152,8 +152,8 @@ void Generator::AddProviderToIndex(const ProviderInfo &provider_info) {
   index.AppendPathComponent("index.yaml");
 
   std::error_code EC;
-  auto strm = make_unique<raw_fd_ostream>(index.GetPath(), EC,
-                                          sys::fs::OpenFlags::F_None);
+  auto strm = llvm::make_unique<raw_fd_ostream>(index.GetPath(), EC,
+                                                sys::fs::OpenFlags::F_None);
   yaml::Output yout(*strm);
   yout << const_cast<ProviderInfo &>(provider_info);
 }