Skip to content

Commit 68a11bb

Browse files
committed
[ci skip] Change/add notes: THIS BRANCH IS OBSOLETE.
1 parent aed215c commit 68a11bb

File tree

2 files changed

+33
-3
lines changed

2 files changed

+33
-3
lines changed

README.rst

+18-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,25 @@
1313

1414
.. start
1515
16-
.. Note::
16+
NOTE
17+
----
1718

18-
This is the pybind11 **smart_holder** branch. Please refer to
19-
``README_smart_holder.rst`` for branch-specific information.
19+
**THIS BRANCH IS OBSOLETE.** — It was merged into the pybind11 master branch
20+
with `PR #5542 <https://github.com/pybind/pybind11/pull/5542>`_.
21+
22+
Please switch to pybind11 master or future pybind11 releases.
23+
24+
You will need to remove ``#include <pybind11/smart_holder.h>``
25+
from your code, and these obsolete macros:
26+
27+
* ``PYBIND11_TYPE_CASTER_BASE_HOLDER``
28+
* ``PYBIND11_SMART_HOLDER_TYPE_CASTERS``
29+
* ``PYBIND11_SH_AVL``
30+
* ``PYBIND11_SH_DEF``
31+
32+
33+
Overview
34+
--------
2035

2136
**pybind11** is a lightweight header-only library that exposes C++ types
2237
in Python and vice versa, mainly to create Python bindings of existing

README_smart_holder.rst

+15
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,21 @@
22
pybind11 — smart_holder branch
33
==============================
44

5+
NOTE
6+
====
7+
8+
**THIS BRANCH IS OBSOLETE.** — It was merged into the pybind11 master branch
9+
with `PR #5542 <https://github.com/pybind/pybind11/pull/5542>`_.
10+
11+
Please switch to pybind11 master or future pybind11 releases.
12+
13+
You will need to remove ``#include <pybind11/smart_holder.h>``
14+
from your code, and these obsolete macros:
15+
16+
* ``PYBIND11_TYPE_CASTER_BASE_HOLDER``
17+
* ``PYBIND11_SMART_HOLDER_TYPE_CASTERS``
18+
* ``PYBIND11_SH_AVL``
19+
* ``PYBIND11_SH_DEF``
520

621
Overview
722
========

0 commit comments

Comments
 (0)