Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
pybind11
Commits
9dcb1c3b
Commit
9dcb1c3b
authored
Jan 19, 2016
by
Wenzel Jakob
Browse files
Merge pull request #71 from ax3l/fix-strBuild2
Fix Compile Error: str Naming
parents
61587164
7cd569c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
include/pybind11/pytypes.h
include/pybind11/pytypes.h
+4
-4
No files found.
include/pybind11/pytypes.h
View file @
9dcb1c3b
...
@@ -261,12 +261,12 @@ public:
...
@@ -261,12 +261,12 @@ public:
};
};
inline
pybind11
::
str
handle
::
str
()
const
{
inline
pybind11
::
str
handle
::
str
()
const
{
PyObject
*
str
=
PyObject_Str
(
m_ptr
);
PyObject
*
str
Value
=
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
(
str
Value
,
"utf-8"
,
nullptr
);
Py_XDECREF
(
str
);
str
=
unicode
;
Py_XDECREF
(
str
Value
);
str
Value
=
unicode
;
#endif
#endif
return
pybind11
::
str
(
str
,
false
);
return
pybind11
::
str
(
str
Value
,
false
);
}
}
class
bytes
:
public
object
{
class
bytes
:
public
object
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment