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 (file)
--- 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 (file)
--- 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);
 }