Browse Source

chore: rename macro `PYBIND11_SUBINTERPRETER_SUPPORT` -> `PYBIND11_HAS_SUBINTERPRETER_SUPPORT` to meet naming convention (#5682)

pull/5685/head
Xuehai Pan 2 months ago committed by GitHub
parent
commit
98bd78f063
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      include/pybind11/detail/common.h
  2. 2
      include/pybind11/detail/internals.h
  3. 2
      include/pybind11/subinterpreter.h
  4. 4
      tests/test_embed/test_subinterpreter.cpp

8
include/pybind11/detail/common.h

@ -232,11 +232,11 @@ @@ -232,11 +232,11 @@
# define PYBIND11_ASSERT_GIL_HELD_INCREF_DECREF
#endif
// Slightly faster code paths are available when PYBIND11_SUBINTERPRETER_SUPPORT is *not* defined,
// so avoid defining it for implementations that do not support subinterpreters.
// However, defining it unnecessarily is not expected to break anything.
// Slightly faster code paths are available when PYBIND11_HAS_SUBINTERPRETER_SUPPORT is *not*
// defined, so avoid defining it for implementations that do not support subinterpreters. However,
// defining it unnecessarily is not expected to break anything.
#if PY_VERSION_HEX >= 0x030C0000 && !defined(PYPY_VERSION) && !defined(GRAALVM_PYTHON)
# define PYBIND11_SUBINTERPRETER_SUPPORT
# define PYBIND11_HAS_SUBINTERPRETER_SUPPORT
#endif
// 3.12 Compatibility

2
include/pybind11/detail/internals.h

@ -324,7 +324,7 @@ inline std::atomic<int> &get_num_interpreters_seen() { @@ -324,7 +324,7 @@ inline std::atomic<int> &get_num_interpreters_seen() {
template <typename InternalsType>
inline std::unique_ptr<InternalsType> *&get_internals_pp() {
#ifdef PYBIND11_SUBINTERPRETER_SUPPORT
#ifdef PYBIND11_HAS_SUBINTERPRETER_SUPPORT
if (get_num_interpreters_seen() > 1) {
// Internals is one per interpreter. When multiple interpreters are alive in different
// threads we have to allow them to have different internals, so we need a thread_local.

2
include/pybind11/subinterpreter.h

@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
#include <stdexcept>
#if !defined(PYBIND11_SUBINTERPRETER_SUPPORT)
#if !defined(PYBIND11_HAS_SUBINTERPRETER_SUPPORT)
# error "This platform does not support subinterpreters, do not include this file."
#endif

4
tests/test_embed/test_subinterpreter.cpp

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
#include <pybind11/embed.h>
#ifdef PYBIND11_SUBINTERPRETER_SUPPORT
#ifdef PYBIND11_HAS_SUBINTERPRETER_SUPPORT
# include <pybind11/subinterpreter.h>
// Silence MSVC C++17 deprecation warning from Catch regarding std::uncaught_exceptions (up to
@ -428,4 +428,4 @@ TEST_CASE("Per-Subinterpreter GIL") { @@ -428,4 +428,4 @@ TEST_CASE("Per-Subinterpreter GIL") {
}
# endif // Py_MOD_PER_INTERPRETER_GIL_SUPPORTED
#endif // PYBIND11_SUBINTERPRETER_SUPPORT
#endif // PYBIND11_HAS_SUBINTERPRETER_SUPPORT

Loading…
Cancel
Save