Author: hokein
Date: Wed Nov 14 01:42:28 2018
New Revision: 346839
URL: http://llvm.org/viewvc/llvm-project?rev=346839&view=rev
Log:
Fix the "make_unique is ambiguous" compiler error.
Modified:
lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
lldb/trunk/source/Utility/Reproducer.cpp
Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=346839&r1=346838&r2=346839&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Wed Nov
14 01:42:28 2018
@@ -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();
}
Modified: lldb/trunk/source/Utility/Reproducer.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Utility/Reproducer.cpp?rev=346839&r1=346838&r2=346839&view=diff
==============================================================================
--- lldb/trunk/source/Utility/Reproducer.cpp (original)
+++ lldb/trunk/source/Utility/Reproducer.cpp Wed Nov 14 01:42:28 2018
@@ -152,8 +152,8 @@ void Generator::AddProviderToIndex(const
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);
}
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
