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
d23c821b
Commit
d23c821b
authored
Jun 11, 2019
by
Yannick Jadoul
Committed by
Wenzel Jakob
Jun 11, 2019
Browse files
Make static member functions, added with `def_static`, `staticmethod` descriptor instances (#1732)
parent
7a24bcf1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
include/pybind11/pybind11.h
include/pybind11/pybind11.h
+1
-1
include/pybind11/pytypes.h
include/pybind11/pytypes.h
+7
-0
No files found.
include/pybind11/pybind11.h
View file @
d23c821b
...
...
@@ -1121,7 +1121,7 @@ public:
"def_static(...) called with a non-static member function pointer"
);
cpp_function
cf
(
std
::
forward
<
Func
>
(
f
),
name
(
name_
),
scope
(
*
this
),
sibling
(
getattr
(
*
this
,
name_
,
none
())),
extra
...);
attr
(
cf
.
name
())
=
cf
;
attr
(
cf
.
name
())
=
staticmethod
(
cf
)
;
return
*
this
;
}
...
...
include/pybind11/pytypes.h
View file @
d23c821b
...
...
@@ -742,6 +742,8 @@ inline bool PyEllipsis_Check(PyObject *o) { return o == Py_Ellipsis; }
inline
bool
PyUnicode_Check_Permissive
(
PyObject
*
o
)
{
return
PyUnicode_Check
(
o
)
||
PYBIND11_BYTES_CHECK
(
o
);
}
inline
bool
PyStaticMethod_Check
(
PyObject
*
o
)
{
return
o
->
ob_type
==
&
PyStaticMethod_Type
;
}
class
kwargs_proxy
:
public
handle
{
public:
explicit
kwargs_proxy
(
handle
h
)
:
handle
(
h
)
{
}
...
...
@@ -1281,6 +1283,11 @@ public:
bool
is_cpp_function
()
const
{
return
(
bool
)
cpp_function
();
}
};
class
staticmethod
:
public
object
{
public:
PYBIND11_OBJECT_CVT
(
staticmethod
,
object
,
detail
::
PyStaticMethod_Check
,
PyStaticMethod_New
)
};
class
buffer
:
public
object
{
public:
PYBIND11_OBJECT_DEFAULT
(
buffer
,
object
,
PyObject_CheckBuffer
)
...
...
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