[Lldb-commits] [lldb] r363653 - Fix windows build for r363357

[Pavel Labath via lldb-commits]

Author: labath
Date: Tue Jun 18 00:02:53 2019
New Revision: 363653

URL: http://llvm.org/viewvc/llvm-project?rev=363653&view=rev
Log:
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.

Modified:
    lldb/trunk/include/lldb/Core/UniqueCStringMap.h

Modified: lldb/trunk/include/lldb/Core/UniqueCStringMap.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/UniqueCStringMap.h?rev=363653&r1=363652&r2=363653&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/UniqueCStringMap.h (original)
+++ lldb/trunk/include/lldb/Core/UniqueCStringMap.h Tue Jun 18 00:02:53 2019
@@ -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