diff options
| author | Zachary Turner <zturner@google.com> | 2015-11-12 17:01:48 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2015-11-12 17:01:48 +0000 |
| commit | 02bf92d22651dd7feb2828974fdcc5dc0e23ddfb (patch) | |
| tree | f217dfc077c6da0537bef5c82bd9d099991a2902 | |
| parent | fd3fe9e45aeadd4cfb41966c7bd5e7c36c687ab0 (diff) | |
| download | bcm5719-llvm-02bf92d22651dd7feb2828974fdcc5dc0e23ddfb.tar.gz bcm5719-llvm-02bf92d22651dd7feb2828974fdcc5dc0e23ddfb.zip | |
Fix non-Windows build after r252906.
llvm-svn: 252909
4 files changed, 5 insertions, 4 deletions
diff --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/scripts/Python/python-wrapper.swig index 250af21eae0..9d28bc9d1d3 100644 --- a/lldb/scripts/Python/python-wrapper.swig +++ b/lldb/scripts/Python/python-wrapper.swig @@ -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; } diff --git a/lldb/scripts/lldb.swig b/lldb/scripts/lldb.swig index 99db6faca61..1d333540728 100644 --- a/lldb/scripts/lldb.swig +++ b/lldb/scripts/lldb.swig @@ -48,6 +48,7 @@ import six /* 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 abcf71b8663..73f9b8cae88 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp @@ -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); diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h index 3794cc04a65..a23052f6871 100644 --- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h +++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h @@ -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>(); } |
