maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix non-Windows build after r252906. 

llvm-svn: 252909
This commit is contained in:
Zachary Turner 2015-11-12 17:01:48 +00:00
parent fd3fe9e45a
commit 02bf92d226
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/scripts/Python/python-wrapper.swig
View File

@ -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;
}

1
lldb/scripts/lldb.swig
View File

@ -48,6 +48,7 @@ import six
/* C++ headers to be included. */
%{
#include <algorithm>
#include <string>
%}

2
lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.cpp
View File

@ -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);

4
lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
View File

@ -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>();
}