Fix non-Windows build after r252906.
llvm-svn: 252909
diff --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/scripts/Python/python-wrapper.swig
index 250af21..9d28bc9 100644
--- a/lldb/scripts/Python/python-wrapper.swig
+++ b/lldb/scripts/Python/python-wrapper.swig
@@ -566,7 +566,7 @@
}
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;
}
diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig
index 99db6fa..1d33354 100644
--- a/lldb/scripts/lldb.swig
+++ b/lldb/scripts/lldb.swig
@@ -48,6 +48,7 @@
/* C++ headers to be included. */
%{
+#include <algorithm>
#include <string>
%}
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
index abcf71b..73f9b8c 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
@@ -109,7 +109,7 @@
}
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);
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
index 3794cc0..a23052f 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
@@ -205,11 +205,11 @@
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>();
}