wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the "make_unique is ambiguous" compiler error. 

llvm-svn: 346839
This commit is contained in:
Haojian Wu 2018-11-14 09:42:28 +00:00
parent 692f12b389
commit 01b098840f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
View File

@ -169,7 +169,7 @@ public:
GetDirectory().CopyByAppendingPathComponent("gdb-remote.yaml"); GetDirectory().CopyByAppendingPathComponent("gdb-remote.yaml");
std::error_code EC; std::error_code EC;
m_stream_up = make_unique<raw_fd_ostream>(history_file.GetPath(), EC, m_stream_up = llvm::make_unique<raw_fd_ostream>(history_file.GetPath(), EC,
sys::fs::OpenFlags::F_None); sys::fs::OpenFlags::F_None);
return m_stream_up.get(); return m_stream_up.get();
} }

2
lldb/source/Utility/Reproducer.cpp
View File

@ -152,7 +152,7 @@ void Generator::AddProviderToIndex(const ProviderInfo &provider_info) {
index.AppendPathComponent("index.yaml"); index.AppendPathComponent("index.yaml");
std::error_code EC; std::error_code EC;
auto strm = make_unique<raw_fd_ostream>(index.GetPath(), EC, auto strm = llvm::make_unique<raw_fd_ostream>(index.GetPath(), EC,
sys::fs::OpenFlags::F_None); sys::fs::OpenFlags::F_None);
yaml::Output yout(*strm); yaml::Output yout(*strm);
yout << const_cast<ProviderInfo &>(provider_info); yout << const_cast<ProviderInfo &>(provider_info);