Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-11-22 21:25:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from ax3l/fix-strBuild2

Browse Source 
Fix Compile Error: str Naming
This commit is contained in:
Wenzel Jakob 2016-01-19 09:50:49 +01:00
commit 9dcb1c3b3a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/pybind11/pytypes.h
View File

@ -261,12 +261,12 @@ public:
}; };
inline pybind11::str handle::str() const { inline pybind11::str handle::str() const {
PyObject *str = PyObject_Str(m_ptr); PyObject *strValue = PyObject_Str(m_ptr);
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
PyObject *unicode = PyUnicode_FromEncodedObject(str, "utf-8", nullptr); PyObject *unicode = PyUnicode_FromEncodedObject(strValue, "utf-8", nullptr);
Py_XDECREF(str); str = unicode; Py_XDECREF(strValue); strValue = unicode;
#endif #endif
return pybind11::str(str, false); return pybind11::str(strValue, false);
} }
class bytes : public object { class bytes : public object {