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
587d5f84
Unverified
Commit
587d5f84
authored
Jan 28, 2021
by
Yannick Jadoul
Committed by
GitHub
Jan 28, 2021
Browse files
Update breathe to 4.26.1, add make_tuple, make_iterator, and make_key_iterator (#2828)
parent
9b7bfef8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
docs/reference.rst
docs/reference.rst
+11
-1
docs/requirements.txt
docs/requirements.txt
+1
-1
include/pybind11/pybind11.h
include/pybind11/pybind11.h
+4
-0
include/pybind11/pytypes.h
include/pybind11/pytypes.h
+2
-0
No files found.
docs/reference.rst
View file @
587d5f84
...
...
@@ -52,6 +52,17 @@ Convenience classes for specific Python types
.. doxygengroup:: pytypes
:members:
Convenience functions converting to Python types
================================================
.. doxygenfunction:: make_tuple(Args&&...)
.. doxygenfunction:: make_iterator(Iterator, Sentinel, Extra &&...)
.. doxygenfunction:: make_iterator(Type &, Extra&&...)
.. doxygenfunction:: make_key_iterator(Iterator, Sentinel, Extra &&...)
.. doxygenfunction:: make_key_iterator(Type &, Extra&&...)
.. _extras:
Passing extra arguments to ``def`` or ``class_``
...
...
@@ -110,7 +121,6 @@ Exceptions
.. doxygenclass:: builtin_exception
:members:
Literals
========
...
...
docs/requirements.txt
View file @
587d5f84
breathe==4.2
5
.1
breathe==4.2
6
.1
commonmark==0.9.1
recommonmark==0.7.1
sphinx==3.3.1
...
...
include/pybind11/pybind11.h
View file @
587d5f84
...
...
@@ -1890,7 +1890,9 @@ PYBIND11_NAMESPACE_END(detail)
template
<
return_value_policy
Policy
=
return_value_policy
::
reference_internal
,
typename
Iterator
,
typename
Sentinel
,
#ifndef DOXYGEN_SHOULD_SKIP_THIS // Issue in breathe 4.26.1
typename
ValueType
=
decltype
(
*
std
::
declval
<
Iterator
>()),
#endif
typename
...
Extra
>
iterator
make_iterator
(
Iterator
first
,
Sentinel
last
,
Extra
&&
...
extra
)
{
using
state
=
detail
::
iterator_state
<
Iterator
,
Sentinel
,
false
,
Policy
>
;
...
...
@@ -1919,7 +1921,9 @@ iterator make_iterator(Iterator first, Sentinel last, Extra &&... extra) {
template
<
return_value_policy
Policy
=
return_value_policy
::
reference_internal
,
typename
Iterator
,
typename
Sentinel
,
#ifndef DOXYGEN_SHOULD_SKIP_THIS // Issue in breathe 4.26.1
typename
KeyType
=
decltype
((
*
std
::
declval
<
Iterator
>()).
first
),
#endif
typename
...
Extra
>
iterator
make_key_iterator
(
Iterator
first
,
Sentinel
last
,
Extra
&&
...
extra
)
{
using
state
=
detail
::
iterator_state
<
Iterator
,
Sentinel
,
true
,
Policy
>
;
...
...
include/pybind11/pytypes.h
View file @
587d5f84
...
...
@@ -279,8 +279,10 @@ protected:
struct
borrowed_t
{
};
struct
stolen_t
{
};
#ifndef DOXYGEN_SHOULD_SKIP_THIS // Issue in breathe 4.26.1
template
<
typename
T
>
friend
T
reinterpret_borrow
(
handle
);
template
<
typename
T
>
friend
T
reinterpret_steal
(
handle
);
#endif
public:
// Only accessible from derived classes and the reinterpret_* functions
...
...
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