From e51594025216ac858a46610852f9866ba6503145 Mon Sep 17 00:00:00 2001 From: "Ralf W. Grosse-Kunstleve" Date: Tue, 21 Jun 2022 14:56:34 -0700 Subject: [PATCH] Minor cleanup. --- include/pybind11/cast.h | 3 --- include/pybind11/pybind11.h | 6 +++--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/include/pybind11/cast.h b/include/pybind11/cast.h index 35ed175e3..b4f94db17 100644 --- a/include/pybind11/cast.h +++ b/include/pybind11/cast.h @@ -860,7 +860,6 @@ protected: return result.release(); } - // TODO: PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL...? Tuple...> subcasters; }; @@ -1370,7 +1369,6 @@ tuple make_tuple() { template tuple make_tuple(Args &&...args_) { - // TODO: PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL...? constexpr size_t size = sizeof...(Args); std::array args{{reinterpret_steal( detail::make_caster::cast(std::forward(args_), policy, nullptr))...}}; @@ -1601,7 +1599,6 @@ private: return std::forward(f)(cast_op(std::move(std::get(argcasters)))...); } - // TODO: PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL...? std::tuple...> argcasters; }; diff --git a/include/pybind11/pybind11.h b/include/pybind11/pybind11.h index e15f8abfd..03681f1d1 100644 --- a/include/pybind11/pybind11.h +++ b/include/pybind11/pybind11.h @@ -214,7 +214,7 @@ protected: /* Type casters for the function arguments and return value */ using cast_in = argument_loader; using make_caster_type_out = conditional_t::value, void_type, Return>; - PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(make_caster_type_out); + PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(make_caster_type_out) using cast_out = make_caster; static_assert( @@ -1855,7 +1855,7 @@ public: auto *ptr = new capture{std::forward(func)}; install_buffer_funcs( [](PyObject *obj, void *ptr) -> buffer_info * { - PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(type); + PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(type) detail::make_caster caster; if (!caster.load(obj, false)) { return nullptr; @@ -2717,7 +2717,7 @@ void implicitly_convertible() { return nullptr; } set_flag flag_helper(currently_used); - PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(InputType); + PYBIND11_DETAIL_TYPE_CASTER_ACCESS_TRANSLATION_UNIT_LOCAL(InputType) if (!detail::make_caster().load(obj, false)) { return nullptr; }