Skip to content

Commit 7c6fe49

Browse files
rwgkrwgk
authored
find . -name '*.h' -o -name '*.cpp' -o -name '*.py' | xargs -n 1 -- sed -i 's/PYBIND11_HAVE_/PYBIND11_HAS_/g' (#5286)
1 parent 48f2527 commit 7c6fe49

File tree

49 files changed

+116
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+116
-116
lines changed

‎include/pybind11/attr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ struct type_record {
331331
/// Is the class inheritable from python classes?
332332
bool is_final : 1;
333333

334-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
334+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
335335
holder_enum_t holder_enum_v = holder_enum_t::undefined;
336336
#endif
337337

‎include/pybind11/cast.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ struct copyable_holder_caster : public type_caster_base<type> {
836836
holder_type holder;
837837
};
838838

839-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
839+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
840840

841841
template <typename, typename SFINAE = void>
842842
struct copyable_holder_caster_shared_ptr_with_smart_holder_support_enabled : std::true_type {};
@@ -963,7 +963,7 @@ struct copyable_holder_caster<
963963
smart_holder_type_caster_support::load_helper<remove_cv_t<type>> sh_load_helper; // Const2Mutbl
964964
};
965965

966-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
966+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
967967

968968
/// Specialize for the common std::shared_ptr, so users don't need to
969969
template <typename T>
@@ -985,7 +985,7 @@ struct move_only_holder_caster {
985985
static constexpr auto name = type_caster_base<type>::name;
986986
};
987987

988-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
988+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
989989

990990
template <typename, typename SFINAE = void>
991991
struct move_only_holder_caster_unique_ptr_with_smart_holder_support_enabled : std::true_type {};
@@ -1089,7 +1089,7 @@ struct move_only_holder_caster<
10891089
smart_holder_type_caster_support::load_helper<remove_cv_t<type>> sh_load_helper; // Const2Mutbl
10901090
};
10911091

1092-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1092+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
10931093

10941094
template <typename type, typename deleter>
10951095
class type_caster<std::unique_ptr<type, deleter>>
@@ -1127,7 +1127,7 @@ struct is_holder_type
11271127
template <typename base, typename deleter>
11281128
struct is_holder_type<base, std::unique_ptr<base, deleter>> : std::true_type {};
11291129

1130-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1130+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
11311131
template <typename base>
11321132
struct is_holder_type<base, smart_holder> : std::true_type {};
11331133
#endif

‎include/pybind11/detail/init.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ void construct(value_and_holder &v_h, Alias<Class> &&result, bool) {
198198
v_h.value_ptr() = new Alias<Class>(std::move(result));
199199
}
200200

201-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
201+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
202202

203203
template <typename T, typename D>
204204
smart_holder init_smart_holder_from_unique_ptr(std::unique_ptr<T, D> &&unq_ptr,
@@ -268,7 +268,7 @@ void construct(value_and_holder &v_h,
268268
v_h.type->init_instance(v_h.inst, &smhldr);
269269
}
270270

271-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
271+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
272272

273273
// Implementing class for py::init<...>()
274274
template <typename... Args>

‎include/pybind11/detail/internals.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ struct internals {
240240

241241
#if PYBIND11_INTERNALS_VERSION >= 6
242242

243-
# define PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
243+
# define PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
244244

245245
enum class holder_enum_t : uint8_t {
246246
undefined,
@@ -280,7 +280,7 @@ struct type_info {
280280
bool default_holder : 1;
281281
/* true if this is a type registered with py::module_local */
282282
bool module_local : 1;
283-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
283+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
284284
holder_enum_t holder_enum_v = holder_enum_t::undefined;
285285
#endif
286286
};

‎include/pybind11/detail/type_caster_base.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ inline PyThreadState *get_thread_state_unchecked() {
472472
void keep_alive_impl(handle nurse, handle patient);
473473
inline PyObject *make_new_instance(PyTypeObject *type);
474474

475-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
475+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
476476

477477
// SMART_HOLDER_WIP: Needs refactoring of existing pybind11 code.
478478
inline bool deregister_instance(instance *self, void *valptr, const type_info *tinfo);
@@ -823,7 +823,7 @@ struct load_helper : value_and_holder_helper {
823823

824824
PYBIND11_NAMESPACE_END(smart_holder_type_caster_support)
825825

826-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
826+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
827827

828828
class type_caster_generic {
829829
public:
@@ -929,7 +929,7 @@ class type_caster_generic {
929929

930930
// Base methods for generic caster; there are overridden in copyable_holder_caster
931931
void load_value(value_and_holder &&v_h) {
932-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
932+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
933933
if (typeinfo->holder_enum_v == detail::holder_enum_t::smart_holder) {
934934
smart_holder_type_caster_support::value_and_holder_helper v_h_helper;
935935
v_h_helper.loaded_v_h = v_h;

‎include/pybind11/detail/using_smart_holder.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99

1010
#include <type_traits>
1111

12-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
12+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1313
# include "smart_holder_poc.h"
1414
#endif
1515

1616
PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
1717

18-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
18+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1919
using pybindit::memory::smart_holder;
2020
#endif
2121

2222
PYBIND11_NAMESPACE_BEGIN(detail)
2323

24-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
24+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
2525
template <typename H>
2626
using is_smart_holder = std::is_same<H, smart_holder>;
2727
#else

‎include/pybind11/pybind11.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,7 +1424,7 @@ class generic_type : public object {
14241424
tinfo->simple_ancestors = true;
14251425
tinfo->default_holder = rec.default_holder;
14261426
tinfo->module_local = rec.module_local;
1427-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1427+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
14281428
tinfo->holder_enum_v = rec.holder_enum_v;
14291429
#endif
14301430

@@ -1631,7 +1631,7 @@ PYBIND11_NAMESPACE_END(detail)
16311631
template <typename T, typename D, typename SFINAE = void>
16321632
struct property_cpp_function : detail::property_cpp_function_classic<T, D> {};
16331633

1634-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1634+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
16351635

16361636
PYBIND11_NAMESPACE_BEGIN(detail)
16371637

@@ -1810,10 +1810,10 @@ struct property_cpp_function<
18101810
detail::both_t_and_d_use_type_caster_base<T, typename D::element_type>>::value>>
18111811
: detail::property_cpp_function_sh_unique_ptr_member<T, D> {};
18121812

1813-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1813+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
18141814

18151815
#if defined(PYBIND11_USE_SMART_HOLDER_AS_DEFAULT) \
1816-
&& defined(PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT)
1816+
&& defined(PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT)
18171817
// NOTE: THIS IS MEANT FOR STRESS-TESTING ONLY!
18181818
// As of PR #5257, for production use, there is no longer a strong reason to make
18191819
// smart_holder the default holder:
@@ -1881,7 +1881,7 @@ class class_ : public detail::generic_type {
18811881
// A more fitting name would be uses_unique_ptr_holder.
18821882
record.default_holder = detail::is_instantiation<std::unique_ptr, holder_type>::value;
18831883

1884-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1884+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
18851885
if (detail::is_instantiation<std::unique_ptr, holder_type>::value) {
18861886
record.holder_enum_v = detail::holder_enum_t::std_unique_ptr;
18871887
} else if (detail::is_instantiation<std::shared_ptr, holder_type>::value) {
@@ -2226,7 +2226,7 @@ class class_ : public detail::generic_type {
22262226
init_holder(inst, v_h, (const holder_type *) holder_ptr, v_h.value_ptr<type>());
22272227
}
22282228

2229-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
2229+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
22302230

22312231
template <typename WrappedType>
22322232
static bool try_initialization_using_shared_from_this(holder_type *, WrappedType *, ...) {
@@ -2288,7 +2288,7 @@ class class_ : public detail::generic_type {
22882288
v_h.set_holder_constructed();
22892289
}
22902290

2291-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
2291+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
22922292

22932293
/// Deallocates an instance; via holder, if constructed; otherwise via operator delete.
22942294
static void dealloc(detail::value_and_holder &v_h) {
@@ -2330,7 +2330,7 @@ class class_ : public detail::generic_type {
23302330
}
23312331
};
23322332

2333-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
2333+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
23342334

23352335
// Supports easier switching between py::class_<T> and py::class_<T, py::smart_holder>:
23362336
// users can simply replace the `_` in `class_` with `h` or vice versa.

‎include/pybind11/trampoline_self_life_support.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "detail/internals.h"
88

9-
#ifdef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
9+
#ifdef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
1010

1111
# include "detail/common.h"
1212
# include "detail/using_smart_holder.h"
@@ -64,4 +64,4 @@ struct trampoline_self_life_support {
6464

6565
PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
6666

67-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
67+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT

‎tests/class_sh_module_local_0.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ atyp rtrn_valu_atyp() { return atyp(); }
1919
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_module_local::atyp)
2020

2121
PYBIND11_MODULE(class_sh_module_local_0, m) {
22-
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
23-
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
22+
m.attr("defined_PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
23+
#ifndef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
2424
false;
2525
#else
2626
true;
@@ -30,5 +30,5 @@ PYBIND11_MODULE(class_sh_module_local_0, m) {
3030
m.def("get_mtxt", get_mtxt);
3131

3232
m.def("rtrn_valu_atyp", rtrn_valu_atyp);
33-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
33+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
3434
}

‎tests/class_sh_module_local_1.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ std::string get_mtxt(const atyp &obj) { return obj.mtxt; }
1818
PYBIND11_SMART_HOLDER_TYPE_CASTERS(pybind11_tests::class_sh_module_local::atyp)
1919

2020
PYBIND11_MODULE(class_sh_module_local_1, m) {
21-
m.attr("defined_PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
22-
#ifndef PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
21+
m.attr("defined_PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT") =
22+
#ifndef PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
2323
false;
2424
#else
2525
true;
@@ -36,5 +36,5 @@ PYBIND11_MODULE(class_sh_module_local_1, m) {
3636
.def("tag", [](const atyp &) { return 1; });
3737

3838
m.def("get_mtxt", get_mtxt);
39-
#endif // PYBIND11_HAVE_INTERNALS_WITH_SMART_HOLDER_SUPPORT
39+
#endif // PYBIND11_HAS_INTERNALS_WITH_SMART_HOLDER_SUPPORT
4040
}

0 commit comments

Comments
 (0)