Use overload_cast

openPMD · Jun 15, 2023 · b381ad8 · b381ad8
1 parent 769adbc
commit b381ad8
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 15 deletions.
diff --git a/src/binding/julia/Container.hpp b/src/binding/julia/Container.hpp
@@ -36,7 +36,6 @@ void define_julia_Container(jlcxx::Module &mod)
         using ContainerT = typename decltype(type)::type;
         using key_type = typename ContainerT::key_type;
         using mapped_type = typename ContainerT::mapped_type;
-        using size_type = typename ContainerT::size_type;
         static_assert(std::is_same_v<Eltype, mapped_type>);
         static_assert(std::is_same_v<Keytype, key_type>);
 
@@ -62,9 +61,7 @@ void define_julia_Container(jlcxx::Module &mod)
         type.method("cxx_count", &ContainerT::count);
         type.method("cxx_contains", &ContainerT::contains);
         type.method(
-            "cxx_delete!",
-            static_cast<size_type (ContainerT::*)(const key_type &)>(
-                &ContainerT::erase));
+            "cxx_delete!", overload_cast<const key_type &>(&ContainerT::erase));
         type.method("cxx_keys", [](const ContainerT &cont) {
             std::vector<key_type> res;
             res.reserve(cont.size());

diff --git a/src/binding/julia/Iteration.cpp b/src/binding/julia/Iteration.cpp
@@ -25,9 +25,7 @@ void define_julia_Iteration(jlcxx::Module &mod)
     type.method("cxx_set_dt!", &Iteration::setDt<double>);
     type.method("cxx_time_unit_SI", &Iteration::timeUnitSI);
     type.method("cxx_set_time_unit_SI!", &Iteration::setTimeUnitSI);
-    type.method(
-        "cxx_close",
-        static_cast<Iteration &(Iteration::*)(bool)>(&Iteration::close));
+    type.method("cxx_close", overload_cast<bool>(&Iteration::close));
     type.method("cxx_open", &Iteration::open);
     type.method("cxx_closed", &Iteration::closed);
     type.method("cxx_meshes", [](Iteration &iter) -> Container<Mesh> & {

diff --git a/src/binding/julia/Mesh.cpp b/src/binding/julia/Mesh.cpp
@@ -46,8 +46,7 @@ void define_julia_Mesh(jlcxx::Module &mod)
 
     type.method("cxx_geometry", &Mesh::geometry);
     type.method(
-        "cxx_set_geometry!",
-        static_cast<Mesh &(Mesh::*)(Mesh::Geometry g)>(&Mesh::setGeometry));
+        "cxx_set_geometry!", overload_cast<Mesh::Geometry>(&Mesh::setGeometry));
     type.method("cxx_geometry_parameters", &Mesh::geometryParameters);
     type.method("cxx_set_geometry_parameters!", &Mesh::setGeometryParameters);
     type.method("cxx_data_order", &Mesh::dataOrder);

diff --git a/src/binding/julia/RecordComponent_load_chunk.cpp b/src/binding/julia/RecordComponent_load_chunk.cpp
@@ -11,8 +11,7 @@ struct UseType
     {
         type.method(
             "cxx_load_" + datatypeToString(determineDatatype<T>()),
-            static_cast<void (RecordComponent::*)(
-                std::shared_ptr<T>, Offset, Extent)>(
+            overload_cast<std::shared_ptr<T>, Offset, Extent>(
                 &RecordComponent::loadChunk<T>));
     }
 };

diff --git a/src/binding/julia/RecordComponent_store_chunk.cpp b/src/binding/julia/RecordComponent_store_chunk.cpp
@@ -11,8 +11,7 @@ struct UseType
     {
         type.method(
             "cxx_store_chunk_" + datatypeToString(determineDatatype<T>()),
-            static_cast<void (RecordComponent::*)(
-                std::shared_ptr<T>, Offset, Extent)>(
+            overload_cast<std::shared_ptr<T>, Offset, Extent>(
                 &RecordComponent::storeChunk<T>));
     }
 };

diff --git a/src/binding/julia/Series.cpp b/src/binding/julia/Series.cpp
@@ -78,8 +78,7 @@ void define_julia_Series(jlcxx::Module &mod)
     type.method("cxx_software", &Series::software);
     type.method(
         "cxx_set_software!",
-        static_cast<Series &(Series::*)(const std::string &,
-                                        const std::string &)>(
+        overload_cast<const std::string &, const std::string &>(
             &Series::setSoftware));
     type.method(
         "cxx_set_software!",

diff --git a/src/binding/julia/defs.hpp b/src/binding/julia/defs.hpp
@@ -52,6 +52,48 @@ using sized_uint_t = typename sized_uint<I>::type;
 
 using array_double_7 = std::array<double, 7>;
 
+// From pybind11, see
+// share/openPMD/thirdParty/pybind11/include/pybind11/detail/common.h
+// in the source tree
+struct non_const_tag
+{};
+struct const_tag
+{};
+
+namespace detail
+{
+template <typename... Args>
+struct overload_cast_impl
+{
+    template <typename Return>
+    constexpr auto operator()(Return (*pf)(Args...)) const noexcept
+        -> decltype(pf)
+    {
+        return pf;
+    }
+
+    template <typename Return, typename Class>
+    constexpr auto
+    operator()(Return (Class::*pmf)(Args...), non_const_tag = {}) const noexcept
+        -> decltype(pmf)
+    {
+        return pmf;
+    }
+
+    template <typename Return, typename Class>
+    constexpr auto
+    operator()(Return (Class::*pmf)(Args...) const, const_tag) const noexcept
+        -> decltype(pmf)
+    {
+        return pmf;
+    }
+};
+} // namespace detail
+
+template <typename... Args>
+static constexpr ::detail::overload_cast_impl<Args...> overload_cast{};
+constexpr const_tag const const_;
+
 /**
  * Generalizes the repeated application of a function template for all
  * scalar openPMD datatypes.