From afb17daedf958ae72597a739324033fd67f2e658 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Tue, 18 Jun 2019 07:02:53 +0000 Subject: [PATCH] Fix windows build for r363357 MSVC has trouble referencing the protected Compare class from from the friend Entry operator<. Just delete that operator, as it's used only once. llvm-svn: 363653 --- lldb/include/lldb/Core/UniqueCStringMap.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lldb/include/lldb/Core/UniqueCStringMap.h b/lldb/include/lldb/Core/UniqueCStringMap.h index a20e1b6ef057..9949bd45f4fa 100644 --- a/lldb/include/lldb/Core/UniqueCStringMap.h +++ b/lldb/include/lldb/Core/UniqueCStringMap.h @@ -28,10 +28,6 @@ public: struct Entry { Entry(ConstString cstr, const T &v) : cstring(cstr), value(v) {} - friend bool operator<(const Entry &lhs, const Entry &rhs) { - return Compare()(lhs, rhs); - } - ConstString cstring; T value; }; @@ -165,7 +161,7 @@ public: // my_map.Append (UniqueCStringMap::Entry(GetName(...), GetValue(...))); // } // my_map.Sort(); - void Sort() { llvm::sort(m_map.begin(), m_map.end()); } + void Sort() { llvm::sort(m_map.begin(), m_map.end(), Compare()); } // Since we are using a vector to contain our items it will always double its // memory consumption as things are added to the vector, so if you intend to