mirror of
https://github.com/pybind/pybind11.git
synced 2025-02-24 01:19:23 +00:00
Merge branch 'pybind:master' into master
This commit is contained in:
commit
ac03596fe3
@ -37,22 +37,14 @@
|
|||||||
/// further ABI-incompatible changes may be made before the ABI is officially
|
/// further ABI-incompatible changes may be made before the ABI is officially
|
||||||
/// changed to the new version.
|
/// changed to the new version.
|
||||||
#ifndef PYBIND11_INTERNALS_VERSION
|
#ifndef PYBIND11_INTERNALS_VERSION
|
||||||
# if PY_VERSION_HEX >= 0x030C0000 || defined(_MSC_VER)
|
# define PYBIND11_INTERNALS_VERSION 6
|
||||||
// Version bump for Python 3.12+, before first 3.12 beta release.
|
|
||||||
// Version bump for MSVC piggy-backed on PR #4779. See comments there.
|
|
||||||
# ifdef Py_GIL_DISABLED
|
|
||||||
# define PYBIND11_INTERNALS_VERSION 6
|
|
||||||
# else
|
|
||||||
# define PYBIND11_INTERNALS_VERSION 5
|
|
||||||
# endif
|
|
||||||
# else
|
|
||||||
# define PYBIND11_INTERNALS_VERSION 4
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// This requirement is mainly to reduce the support burden (see PR #4570).
|
// This requirement is mainly to reduce the support burden (see PR #4570).
|
||||||
static_assert(PY_VERSION_HEX < 0x030C0000 || PYBIND11_INTERNALS_VERSION >= 5,
|
static_assert(PY_VERSION_HEX < 0x030C0000 || PYBIND11_INTERNALS_VERSION >= 5,
|
||||||
"pybind11 ABI version 5 is the minimum for Python 3.12+");
|
"pybind11 ABI version 5 is the minimum for Python 3.12+");
|
||||||
|
static_assert(PYBIND11_INTERNALS_VERSION >= 4,
|
||||||
|
"pybind11 ABI version 4 is the minimum for all platforms.");
|
||||||
|
|
||||||
PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
|
PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user