Add support for std::shared_ptr.

2026-01-24 18:12:43 +00:00 · 2016-09-22 19:46:38 -04:00
parent 5029273ca8
commit 97e4b34a15
13 changed files with 559 additions and 342 deletions
--- a/include/boost/python/converter/registered.hpp
+++ b/include/boost/python/converter/registered.hpp
@@ -1,19 +1,21 @@
 // Copyright David Abrahams 2002.
+// Copyright Stefan Seefeld 2016.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef REGISTERED_DWA2002710_HPP
-# define REGISTERED_DWA2002710_HPP
-# include <boost/python/type_id.hpp>
-# include <boost/python/converter/registry.hpp>
-# include <boost/python/converter/registrations.hpp>
-# include <boost/type_traits/transform_traits.hpp>
-# include <boost/type_traits/cv_traits.hpp>
-# include <boost/type_traits/is_void.hpp>
-# include <boost/detail/workaround.hpp>
-# include <boost/python/type_id.hpp>
-# include <boost/type.hpp>

+#ifndef boost_python_converter_registered_hpp_
+#define boost_python_converter_registered_hpp_
+
+#include <boost/python/type_id.hpp>
+#include <boost/python/converter/registry.hpp>
+#include <boost/python/converter/registrations.hpp>
+#include <boost/type_traits/transform_traits.hpp>
+#include <boost/type_traits/cv_traits.hpp>
+#include <boost/type_traits/is_void.hpp>
+#include <boost/detail/workaround.hpp>
+#include <boost/type.hpp>
+#include <memory>
 #if defined(BOOST_PYTHON_TRACE_REGISTRY) \
 || defined(BOOST_PYTHON_CONVERTER_REGISTRY_APPLE_MACH_WORKAROUND)
 # include <iostream>
@@ -75,7 +77,16 @@ namespace detail
  {
      registry::lookup_shared_ptr(type_id<shared_ptr<T> >());
  }
-  
+
+#if __cplusplus >= 201103L
+  template <class T>
+  inline void
+  register_shared_ptr0(std::shared_ptr<T>*)
+  {
+      registry::lookup_shared_ptr(type_id<std::shared_ptr<T> >());
+  }
+#endif
+
  template <class T>
  inline void
  register_shared_ptr1(T const volatile*)
@@ -112,4 +123,4 @@ namespace detail

 }}} // namespace boost::python::converter

-#endif // REGISTERED_DWA2002710_HPP
+#endif
--- a/include/boost/python/converter/shared_ptr_from_python.hpp
+++ b/include/boost/python/converter/shared_ptr_from_python.hpp
@@ -1,63 +1,65 @@
 // Copyright David Abrahams 2002.
+// Copyright Stefan Seefeld 2016.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef SHARED_PTR_FROM_PYTHON_DWA20021130_HPP
-# define SHARED_PTR_FROM_PYTHON_DWA20021130_HPP

-# include <boost/python/handle.hpp>
-# include <boost/python/converter/shared_ptr_deleter.hpp>
-# include <boost/python/converter/from_python.hpp>
-# include <boost/python/converter/rvalue_from_python_data.hpp>
-# include <boost/python/converter/registered.hpp>
+#ifndef boost_python_converter_shared_ptr_from_python_hpp_
+#define boost_python_converter_shared_ptr_from_python_hpp_
+
+#include <boost/python/handle.hpp>
+#include <boost/python/converter/shared_ptr_deleter.hpp>
+#include <boost/python/converter/from_python.hpp>
+#include <boost/python/converter/rvalue_from_python_data.hpp>
+#include <boost/python/converter/registered.hpp>
 #ifndef BOOST_PYTHON_NO_PY_SIGNATURES
 # include <boost/python/converter/pytype_function.hpp>
 #endif
-# include <boost/shared_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <memory>

 namespace boost { namespace python { namespace converter { 

-template <class T>
+template <class T, template <typename> class SP>
 struct shared_ptr_from_python
 {
-    shared_ptr_from_python()
-    {
-        converter::registry::insert(&convertible, &construct, type_id<shared_ptr<T> >()
+  shared_ptr_from_python()
+  {
+    converter::registry::insert(&convertible, &construct, type_id<SP<T> >()
 #ifndef BOOST_PYTHON_NO_PY_SIGNATURES
-                      , &converter::expected_from_python_type_direct<T>::get_pytype
+				, &converter::expected_from_python_type_direct<T>::get_pytype
 #endif
-                      );
-    }
+				);
+  }

 private:
-    static void* convertible(PyObject* p)
-    {
-        if (p == Py_None)
-            return p;
+  static void* convertible(PyObject* p)
+  {
+    if (p == Py_None)
+      return p;
        
-        return converter::get_lvalue_from_python(p, registered<T>::converters);
-    }
+    return converter::get_lvalue_from_python(p, registered<T>::converters);
+  }
    
-    static void construct(PyObject* source, rvalue_from_python_stage1_data* data)
+  static void construct(PyObject* source, rvalue_from_python_stage1_data* data)
+  {
+    void* const storage = ((converter::rvalue_from_python_storage<SP<T> >*)data)->storage.bytes;
+    // Deal with the "None" case.
+    if (data->convertible == source)
+      new (storage) SP<T>();
+    else
    {
-        void* const storage = ((converter::rvalue_from_python_storage<shared_ptr<T> >*)data)->storage.bytes;
-        // Deal with the "None" case.
-        if (data->convertible == source)
-            new (storage) shared_ptr<T>();
-        else
-        {
-            boost::shared_ptr<void> hold_convertible_ref_count(
-              (void*)0, shared_ptr_deleter(handle<>(borrowed(source))) );
-            // use aliasing constructor
-            new (storage) shared_ptr<T>(
-                hold_convertible_ref_count,
-                static_cast<T*>(data->convertible));
-        }
-        
-        data->convertible = storage;
+      SP<void> hold_convertible_ref_count(
+	 (void*)0, shared_ptr_deleter(handle<>(borrowed(source))) );
+      // use aliasing constructor
+      new (storage) SP<T>(hold_convertible_ref_count,
+			  static_cast<T*>(data->convertible));
    }
+
+    data->convertible = storage;
+  }
 };

 }}} // namespace boost::python::converter

-#endif // SHARED_PTR_FROM_PYTHON_DWA20021130_HPP
+#endif
--- a/include/boost/python/converter/shared_ptr_to_python.hpp
+++ b/include/boost/python/converter/shared_ptr_to_python.hpp
@@ -1,14 +1,16 @@
 // Copyright David Abrahams 2003.
+// Copyright Stefan Seefeld 2016.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef SHARED_PTR_TO_PYTHON_DWA2003224_HPP
-# define SHARED_PTR_TO_PYTHON_DWA2003224_HPP

-# include <boost/python/refcount.hpp>
-# include <boost/python/converter/shared_ptr_deleter.hpp>
-# include <boost/shared_ptr.hpp>
-# include <boost/get_pointer.hpp>
+#ifndef boost_python_converter_shared_ptr_to_python_hpp_
+#define boost_python_converter_shared_ptr_to_python_hpp_
+
+#include <boost/python/refcount.hpp>
+#include <boost/python/converter/shared_ptr_deleter.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/get_pointer.hpp>

 namespace boost { namespace python { namespace converter { 

@@ -23,6 +25,19 @@ PyObject* shared_ptr_to_python(shared_ptr<T> const& x)
        return converter::registered<shared_ptr<T> const&>::converters.to_python(&x);
 }

+#if __cplusplus >= 201103L
+template <class T>
+PyObject* shared_ptr_to_python(std::shared_ptr<T> const& x)
+{
+  if (!x)
+    return python::detail::none();
+  else if (shared_ptr_deleter* d = std::get_deleter<shared_ptr_deleter>(x))
+    return incref(get_pointer(d->owner));
+  else
+    return converter::registered<std::shared_ptr<T> const&>::converters.to_python(&x);
+}
+#endif
+
 }}} // namespace boost::python::converter

-#endif // SHARED_PTR_TO_PYTHON_DWA2003224_HPP
+#endif
--- a/include/boost/python/detail/is_shared_ptr.hpp
+++ b/include/boost/python/detail/is_shared_ptr.hpp
@@ -1,17 +1,23 @@
 // Copyright David Abrahams 2003.
+// Copyright Stefan Seefeld 2016.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef IS_SHARED_PTR_DWA2003224_HPP
-# define IS_SHARED_PTR_DWA2003224_HPP

-# include <boost/python/detail/is_xxx.hpp>
-# include <boost/shared_ptr.hpp>
+#ifndef boost_python_detail_is_shared_ptr_hpp_
+#define boost_python_detail_is_shared_ptr_hpp_
+
+#include <boost/python/detail/is_xxx.hpp>
+#include <boost/shared_ptr.hpp>

 namespace boost { namespace python { namespace detail { 

 BOOST_PYTHON_IS_XXX_DEF(shared_ptr, shared_ptr, 1)
-    
+#if __cplusplus >= 201103L
+template <typename T>
+struct is_shared_ptr<std::shared_ptr<T> > : std::true_type {};
+#endif
+
 }}} // namespace boost::python::detail

-#endif // IS_SHARED_PTR_DWA2003224_HPP
+#endif
--- a/include/boost/python/detail/value_is_shared_ptr.hpp
+++ b/include/boost/python/detail/value_is_shared_ptr.hpp
@@ -1,17 +1,28 @@
 // Copyright David Abrahams 2003.
+// Copyright Stefan Seefeld 2016.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef VALUE_IS_SHARED_PTR_DWA2003224_HPP
-# define VALUE_IS_SHARED_PTR_DWA2003224_HPP

-# include <boost/python/detail/value_is_xxx.hpp>
-# include <boost/shared_ptr.hpp>
+#ifndef boost_python_detail_value_is_shared_ptr_hpp_
+#define boost_python_detail_value_is_shared_ptr_hpp_
+
+#include <boost/python/detail/value_is_xxx.hpp>
+#include <boost/python/detail/is_shared_ptr.hpp>

 namespace boost { namespace python { namespace detail { 

-BOOST_PYTHON_VALUE_IS_XXX_DEF(shared_ptr, shared_ptr, 1)
-    
+template <class X_>
+struct value_is_shared_ptr
+{
+  static bool const value = is_shared_ptr<typename remove_cv<
+					    typename remove_reference<X_>
+					      ::type>
+					    ::type>
+    ::value;
+  typedef mpl::bool_<value> type;
+};
+
 }}} // namespace boost::python::detail

 #endif // VALUE_IS_SHARED_PTR_DWA2003224_HPP
--- a/include/boost/python/object/class_metadata.hpp
+++ b/include/boost/python/object/class_metadata.hpp
@@ -1,43 +1,46 @@
-// Copyright David Abrahams 2004. Distributed under the Boost
-// Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#ifndef CLASS_METADATA_DWA2004719_HPP
-# define CLASS_METADATA_DWA2004719_HPP
-# include <boost/python/converter/shared_ptr_from_python.hpp>
+// Copyright David Abrahams 2004.
+// Copyright Stefan Seefeld 2016.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)

-# include <boost/python/object/inheritance.hpp>
-# include <boost/python/object/class_wrapper.hpp>
-# include <boost/python/object/make_instance.hpp>
-# include <boost/python/object/value_holder.hpp>
-# include <boost/python/object/pointer_holder.hpp>
-# include <boost/python/object/make_ptr_instance.hpp>
+#ifndef boost_python_object_class_metadata_hpp_
+#define boost_python_object_class_metadata_hpp_

-# include <boost/python/detail/force_instantiate.hpp>
-# include <boost/python/detail/not_specified.hpp>
+#include <boost/python/converter/shared_ptr_from_python.hpp>
+#include <boost/python/object/inheritance.hpp>
+#include <boost/python/object/class_wrapper.hpp>
+#include <boost/python/object/make_instance.hpp>
+#include <boost/python/object/value_holder.hpp>
+#include <boost/python/object/pointer_holder.hpp>
+#include <boost/python/object/make_ptr_instance.hpp>

-# include <boost/python/has_back_reference.hpp>
-# include <boost/python/bases.hpp>
+#include <boost/python/detail/force_instantiate.hpp>
+#include <boost/python/detail/not_specified.hpp>

-# include <boost/type_traits/add_pointer.hpp>
-# include <boost/type_traits/is_convertible.hpp>
-# include <boost/type_traits/is_polymorphic.hpp>
+#include <boost/python/has_back_reference.hpp>
+#include <boost/python/bases.hpp>

-# include <boost/mpl/if.hpp>
-# include <boost/mpl/eval_if.hpp>
-# include <boost/mpl/bool.hpp>
-# include <boost/mpl/or.hpp>
-# include <boost/mpl/identity.hpp>
-# include <boost/mpl/for_each.hpp>
-# include <boost/mpl/placeholders.hpp>
-# include <boost/mpl/single_view.hpp>
+#include <boost/type_traits/add_pointer.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+#include <boost/type_traits/is_polymorphic.hpp>

-# include <boost/mpl/assert.hpp>
-# include <boost/type_traits/is_same.hpp>
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/eval_if.hpp>
+#include <boost/mpl/bool.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/mpl/identity.hpp>
+#include <boost/mpl/for_each.hpp>
+#include <boost/mpl/placeholders.hpp>
+#include <boost/mpl/single_view.hpp>

-# include <boost/type_traits/is_convertible.hpp>
+#include <boost/mpl/assert.hpp>
+#include <boost/type_traits/is_same.hpp>

-# include <boost/noncopyable.hpp>
-# include <boost/detail/workaround.hpp>
+#include <boost/type_traits/is_convertible.hpp>
+
+#include <boost/noncopyable.hpp>
+#include <boost/detail/workaround.hpp>

 namespace boost { namespace python { namespace objects { 

@@ -80,18 +83,22 @@ struct register_base_of
 // Preamble of register_class.  Also used for callback classes, which
 // need some registration of their own.
 //
+
 template <class T, class Bases>
 inline void register_shared_ptr_from_python_and_casts(T*, Bases)
 {
-    // Constructor performs registration
-    python::detail::force_instantiate(converter::shared_ptr_from_python<T>());
+  // Constructor performs registration
+  python::detail::force_instantiate(converter::shared_ptr_from_python<T, boost::shared_ptr>());
+#if __cplusplus >= 201103L
+  python::detail::force_instantiate(converter::shared_ptr_from_python<T, std::shared_ptr>());
+#endif

-    //
-    // register all up/downcasts here.  We're using the alternate
-    // interface to mpl::for_each to avoid an MSVC 6 bug.
-    //
-    register_dynamic_id<T>();
-    mpl::for_each(register_base_of<T>(), (Bases*)0, (add_pointer<mpl::_>*)0);
+  //
+  // register all up/downcasts here.  We're using the alternate
+  // interface to mpl::for_each to avoid an MSVC 6 bug.
+  //
+  register_dynamic_id<T>();
+  mpl::for_each(register_base_of<T>(), (Bases*)0, (add_pointer<mpl::_>*)0);
 }

 //
@@ -220,8 +227,7 @@ struct class_metadata
    template <class T2, class Callback>
    inline static void register_aux2(T2*, Callback) 
    {
-        objects::register_shared_ptr_from_python_and_casts((T2*)0, bases());
-        
+	objects::register_shared_ptr_from_python_and_casts((T2*)0, bases());
        class_metadata::maybe_register_callback_class((T2*)0, Callback());

        class_metadata::maybe_register_class_to_python((T2*)0, is_noncopyable());
@@ -282,9 +288,8 @@ struct class_metadata
    template <class T2>
    inline static void maybe_register_callback_class(T2*, mpl::true_)
    {
-        objects::register_shared_ptr_from_python_and_casts(
+	objects::register_shared_ptr_from_python_and_casts(
            (wrapped*)0, mpl::single_view<T2>());
-
        // explicit qualification of type_id makes msvc6 happy
        objects::copy_class_object(python::type_id<T2>(), python::type_id<wrapped>());
    }
@@ -292,4 +297,4 @@ struct class_metadata

 }}} // namespace boost::python::object

-#endif // CLASS_METADATA_DWA2004719_HPP
+#endif
--- a/include/boost/python/to_python_value.hpp
+++ b/include/boost/python/to_python_value.hpp
@@ -1,30 +1,32 @@
 // Copyright David Abrahams 2002.
+// Copyright Stefan Seefeld 2016.
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef TO_PYTHON_VALUE_DWA200221_HPP
-# define TO_PYTHON_VALUE_DWA200221_HPP

-# include <boost/python/detail/prefix.hpp>
+#ifndef boost_python_to_python_value_hpp_
+#define boost_python_to_python_value_hpp_

-# include <boost/python/refcount.hpp>
-# include <boost/python/tag.hpp>
-# include <boost/python/handle.hpp>
+#include <boost/python/detail/prefix.hpp>

-# include <boost/python/converter/registry.hpp>
-# include <boost/python/converter/registered.hpp>
-# include <boost/python/converter/builtin_converters.hpp>
-# include <boost/python/converter/object_manager.hpp>
-# include <boost/python/converter/shared_ptr_to_python.hpp>
+#include <boost/python/refcount.hpp>
+#include <boost/python/tag.hpp>
+#include <boost/python/handle.hpp>

-# include <boost/python/detail/value_is_shared_ptr.hpp>
-# include <boost/python/detail/value_arg.hpp>
+#include <boost/python/converter/registry.hpp>
+#include <boost/python/converter/registered.hpp>
+#include <boost/python/converter/builtin_converters.hpp>
+#include <boost/python/converter/object_manager.hpp>
+#include <boost/python/converter/shared_ptr_to_python.hpp>

-# include <boost/type_traits/transform_traits.hpp>
+#include <boost/python/detail/value_is_shared_ptr.hpp>
+#include <boost/python/detail/value_arg.hpp>

-# include <boost/mpl/if.hpp>
-# include <boost/mpl/or.hpp>
-# include <boost/type_traits/is_const.hpp>
+#include <boost/type_traits/transform_traits.hpp>
+
+#include <boost/mpl/if.hpp>
+#include <boost/mpl/or.hpp>
+#include <boost/type_traits/is_const.hpp>

 namespace boost { namespace python { 

@@ -114,10 +116,16 @@ struct object_manager_get_pytype<true>
      BOOST_STATIC_CONSTANT(bool, uses_registry = false);
  private:
 #ifndef BOOST_PYTHON_NO_PY_SIGNATURES
-      template <class U>
-      PyTypeObject const* get_pytype(boost::type<shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();}
-      template <class U>
-      PyTypeObject const* get_pytype(boost::type<const shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();}
+    template <class U>
+    PyTypeObject const* get_pytype(boost::type<shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();}
+    template <class U>
+    PyTypeObject const* get_pytype(boost::type<const shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();}
+# if __cplusplus >= 201103L
+    template <class U>
+    PyTypeObject const* get_pytype(boost::type<std::shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();}
+    template <class U>
+    PyTypeObject const* get_pytype(boost::type<const std::shared_ptr<U> &> *) const {return converter::registered<U>::converters.to_python_target_type();}
+# endif
 #endif
  };
 }
@@ -168,4 +176,4 @@ namespace detail

 }} // namespace boost::python

-#endif // TO_PYTHON_VALUE_DWA200221_HPP
+#endif