[Lldb-commits] [lldb] r252909 - Fix non-Windows build after r252906.

[Zachary Turner via lldb-commits]

Author: zturner
Date: Thu Nov 12 11:01:48 2015
New Revision: 252909

URL: http://llvm.org/viewvc/llvm-project?rev=252909&view=rev
Log:
Fix non-Windows build after r252906.

Modified:
    lldb/trunk/scripts/Python/python-wrapper.swig
    lldb/trunk/scripts/lldb.swig
    lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
    lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h

Modified: lldb/trunk/scripts/Python/python-wrapper.swig
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/Python/python-wrapper.swig?rev=252909&r1=252908&r2=252909&view=diff
==============================================================================
--- lldb/trunk/scripts/Python/python-wrapper.swig (original)
+++ lldb/trunk/scripts/Python/python-wrapper.swig Thu Nov 12 11:01:48 2015
@@ -566,7 +566,7 @@ LLDBSwigPython_CalculateNumChildren
     }
 
     if (argc.count == 1)
-        ret_val = std::min(ret_val, max);
+        ret_val = std::min(ret_val, static_cast<size_t>(max));
 
     return ret_val;
 }

Modified: lldb/trunk/scripts/lldb.swig
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/lldb.swig?rev=252909&r1=252908&r2=252909&view=diff
==============================================================================
--- lldb/trunk/scripts/lldb.swig (original)
+++ lldb/trunk/scripts/lldb.swig Thu Nov 12 11:01:48 2015
@@ -48,6 +48,7 @@ import six
 
 /* C++ headers to be included. */
 %{
+#include <algorithm>
 #include <string>
 %}
 

Modified: lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp?rev=252909&r1=252908&r2=252909&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp (original)
+++ lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp Thu Nov 12 11:01:48 2015
@@ -109,7 +109,7 @@ PythonObject::Str() const
 }
 
 PythonObject
-PythonObject::ResolveNameWithDictionary(llvm::StringRef name, PythonDictionary dict)
+PythonObject::ResolveNameWithDictionary(llvm::StringRef name, const PythonDictionary &dict)
 {
     size_t dot_pos = name.find_first_of('.');
     llvm::StringRef piece = name.substr(0, dot_pos);

Modified: lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h?rev=252909&r1=252908&r2=252909&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h (original)
+++ lldb/trunk/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h Thu Nov 12 11:01:48 2015
@@ -205,11 +205,11 @@ public:
     Str() const;
 
     static PythonObject
-    ResolveNameWithDictionary(llvm::StringRef name, PythonDictionary dict);
+    ResolveNameWithDictionary(llvm::StringRef name, const PythonDictionary &dict);
 
     template<typename T>
     static T
-    ResolveNameWithDictionary(llvm::StringRef name, PythonDictionary dict)
+    ResolveNameWithDictionary(llvm::StringRef name, const PythonDictionary &dict)
     {
         return ResolveNameWithDictionary(name, dict).AsType<T>();
     }