Author: jdevlieghere Date: Wed Jul 24 17:56:31 2019 New Revision: 366974 URL: http://llvm.org/viewvc/llvm-project?rev=366974&view=rev Log: [FileSystem] Fix ambiguous symbol on Windows.
The using declarations make FileCollector ambiguous. Specify that FileSystem takes an lldb_private::FileCollector. Modified: lldb/trunk/source/Host/common/FileSystem.cpp Modified: lldb/trunk/source/Host/common/FileSystem.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Host/common/FileSystem.cpp?rev=366974&r1=366973&r2=366974&view=diff ============================================================================== --- lldb/trunk/source/Host/common/FileSystem.cpp (original) +++ lldb/trunk/source/Host/common/FileSystem.cpp Wed Jul 24 17:56:31 2019 @@ -49,7 +49,7 @@ void FileSystem::Initialize() { InstanceImpl().emplace(); } -void FileSystem::Initialize(FileCollector &collector) { +void FileSystem::Initialize(lldb_private::FileCollector &collector) { lldbassert(!InstanceImpl() && "Already initialized."); InstanceImpl().emplace(collector); } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits