mirror of
https://github.com/pybind/pybind11.git
synced 2025-02-17 22:20:41 +00:00
Ignore PYBIND11_USE_SMART_HOLDER_AS_DEFAULT if PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT is not defined.
This commit is contained in:
parent
95e9053f7f
commit
e4456197c4
@ -1797,7 +1797,8 @@ struct property_cpp_function<
|
|||||||
|
|
||||||
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
|
||||||
|
|
||||||
#ifdef PYBIND11_USE_SMART_HOLDER_AS_DEFAULT
|
#if defined(PYBIND11_USE_SMART_HOLDER_AS_DEFAULT) \
|
||||||
|
&& defined(PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT)
|
||||||
// BAKEIN_WIP: Add comment to explain: This is meant for stress-testing only.
|
// BAKEIN_WIP: Add comment to explain: This is meant for stress-testing only.
|
||||||
template <typename>
|
template <typename>
|
||||||
using default_holder_type = smart_holder;
|
using default_holder_type = smart_holder;
|
||||||
|
@ -613,7 +613,8 @@ CHECK_NOALIAS(8);
|
|||||||
CHECK_HOLDER(1, unique);
|
CHECK_HOLDER(1, unique);
|
||||||
CHECK_HOLDER(2, unique);
|
CHECK_HOLDER(2, unique);
|
||||||
CHECK_HOLDER(3, unique);
|
CHECK_HOLDER(3, unique);
|
||||||
#ifdef PYBIND11_USE_SMART_HOLDER_AS_DEFAULT
|
#if defined(PYBIND11_USE_SMART_HOLDER_AS_DEFAULT) \
|
||||||
|
&& defined(PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT)
|
||||||
CHECK_SMART_HOLDER(4);
|
CHECK_SMART_HOLDER(4);
|
||||||
CHECK_SMART_HOLDER(5);
|
CHECK_SMART_HOLDER(5);
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user