Merge branch 'master' into smart_holder

This commit is contained in:
Ralf W. Grosse-Kunstleve 2021-07-10 16:39:02 -07:00
commit 9cd8e7449b
2 changed files with 3 additions and 3 deletions

View File

@ -804,7 +804,7 @@ to bind these two functions:
} }
)); ));
The ``__setstate__`` part of the ``py::picke()`` definition follows the same The ``__setstate__`` part of the ``py::pickle()`` definition follows the same
rules as the single-argument version of ``py::init()``. The return type can be rules as the single-argument version of ``py::init()``. The return type can be
a value, pointer or holder type. See :ref:`custom_constructors` for details. a value, pointer or holder type. See :ref:`custom_constructors` for details.

View File

@ -5,7 +5,7 @@ Frequently asked questions
=========================================================== ===========================================================
1. Make sure that the name specified in PYBIND11_MODULE is identical to the 1. Make sure that the name specified in PYBIND11_MODULE is identical to the
filename of the extension library (without suffixes such as .so) filename of the extension library (without suffixes such as ``.so``).
2. If the above did not fix the issue, you are likely using an incompatible 2. If the above did not fix the issue, you are likely using an incompatible
version of Python (for instance, the extension library was compiled against version of Python (for instance, the extension library was compiled against
@ -170,7 +170,7 @@ complete independence of the symbols involved when not using
``-fvisibility=hidden``. ``-fvisibility=hidden``.
Additionally, ``-fvisibility=hidden`` can deliver considerably binary size Additionally, ``-fvisibility=hidden`` can deliver considerably binary size
savings. (See the following section for more details). savings. (See the following section for more details.)
.. _`faq:symhidden`: .. _`faq:symhidden`: