Fixes for auto_ptr handling

dabrahams · dabrahams · commit e6fd78ce93df · 2004-03-12T15:22:16.000Z
[SVN r22490]
diff --git a/include/boost/python/data_members.hpp b/include/boost/python/data_members.hpp
@@ -19,6 +19,7 @@
 
 # include <boost/python/detail/indirect_traits.hpp>
 # include <boost/python/detail/not_specified.hpp>
+# include <boost/python/detail/value_arg.hpp>
 
 # include <boost/type_traits/add_const.hpp>
 # include <boost/type_traits/add_reference.hpp>
@@ -51,10 +52,6 @@ namespace detail
   template <class Data, class Class>
   struct member
   {
-   private:
-      typedef typename add_const<Data>::type data_const;
-      typedef typename add_reference<data_const>::type data_cref;
-      
    public:      
       member(Data Class::*which) : m_which(which) {}
       
@@ -63,7 +60,7 @@ namespace detail
           return c.*m_which;
       }
 
-      void operator()(Class& c, data_cref d) const
+      void operator()(Class& c, typename value_arg<Data>::type d) const
       {
           c.*m_which = d;
       }
@@ -76,10 +73,6 @@ namespace detail
   template <class Data>
   struct datum
   {
-   private:
-      typedef typename add_const<Data>::type data_const;
-      typedef typename add_reference<data_const>::type data_cref;
-      
    public:      
       datum(Data *which) : m_which(which) {}
       
@@ -88,7 +81,7 @@ namespace detail
           return *m_which;
       }
 
-      void operator()(data_cref d) const
+      void operator()(typename value_arg<Data>::type d) const
       {
           *m_which = d;
       }
@@ -112,11 +105,11 @@ namespace detail
       : mpl::and_<
           mpl::bool_<
               to_python_value<
-                  typename add_reference<typename add_const<T>::type>::type
+                  typename value_arg<T>::type
               >::uses_registry
           >
         , is_reference_to_class<
-              typename add_reference<typename add_const<T>::type>::type
+              typename value_arg<T>::type
           >
        >
   {
diff --git a/include/boost/python/default_call_policies.hpp b/include/boost/python/default_call_policies.hpp
@@ -9,7 +9,11 @@
 # include <boost/python/detail/prefix.hpp>
 # include <boost/mpl/if.hpp>
 # include <boost/python/to_python_value.hpp>
+# include <boost/python/detail/value_arg.hpp>
 # include <boost/type_traits/transform_traits.hpp>
+# include <boost/type_traits/is_pointer.hpp>
+# include <boost/type_traits/is_reference.hpp>
+# include <boost/mpl/or.hpp>
 
 namespace boost { namespace python { 
 
@@ -53,14 +57,12 @@ struct default_result_converter
     template <class R>
     struct apply
     {
-        BOOST_STATIC_CONSTANT(bool, is_illegal = is_reference<R>::value || is_pointer<R>::value);
-        
-        typedef typename mpl::if_c<
-            is_illegal
-            , detail::specify_a_return_value_policy_to_wrap_functions_returning<R>
-            , boost::python::to_python_value<
-                typename add_reference<typename add_const<R>::type>::type
-                >
+        typedef typename mpl::if_<
+            mpl::or_<is_pointer<R>, is_reference<R> >
+          , detail::specify_a_return_value_policy_to_wrap_functions_returning<R>
+          , boost::python::to_python_value<
+                typename detail::value_arg<R>::type
+            >
         >::type type;
     };
 };
diff --git a/include/boost/python/object/forward.hpp b/include/boost/python/object/forward.hpp
@@ -11,10 +11,14 @@
 # include <boost/type_traits/add_const.hpp>
 # include <boost/type_traits/add_reference.hpp>
 # include <boost/ref.hpp>
+# include <boost/python/detail/value_arg.hpp>
+# include <boost/python/detail/copy_ctor_mutates_rhs.hpp>
 # if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
 #  include <boost/type_traits/is_enum.hpp>
 #  include <boost/mpl/and.hpp>
 #  include <boost/mpl/not.hpp>
+# else
+#  include <boost/mpl/or.hpp>
 # endif 
 
 namespace boost { namespace python { namespace objects { 
@@ -48,7 +52,7 @@ struct forward
               >
           >
 # else 
-          is_scalar<T>
+          mpl::or_<python::detail::copy_ctor_mutates_rhs<T>, is_scalar<T> >
 # endif 
         , T
         , reference_to_value<T>
@@ -71,10 +75,8 @@ struct unforward<reference_to_value<T> >
 
 template <typename T>
 struct unforward_cref
-  : add_reference<
-        typename add_const<
-            typename unwrap_reference<T>::type
-        >::type
+  : python::detail::value_arg<
+        typename unwrap_reference<T>::type
     >
 {
 };
@@ -122,10 +124,8 @@ namespace detail
   {
       template <class T>
       struct apply
-        : add_reference<
-              typename add_const<
-                  typename unwrap_reference<T>::type
-              >::type
+        : python::detail::value_arg<
+              typename unwrap_reference<T>::type
           >
       {          
       };
@@ -136,11 +136,9 @@ namespace detail
   {
       template <class T>
       struct apply
-          : add_reference<
-                typename add_const<
-                    typename T::reference
-                >::type
-            >
+        : python::detail::value_arg<
+              typename T::reference
+          >
       {
       };
   };
diff --git a/include/boost/python/object_core.hpp b/include/boost/python/object_core.hpp
@@ -176,6 +176,8 @@ namespace api
 # endif
       
    private: // def visitation for adding callable objects as class methods
+      using def_visitor<U>::visit;
+      
       template <class ClassT, class DocStringT>
       void visit(ClassT& cl, char const* name, python::detail::def_helper<DocStringT> const& helper) const
       {
diff --git a/include/boost/python/return_arg.hpp b/include/boost/python/return_arg.hpp
@@ -7,6 +7,7 @@
 # define RETURN_ARG_DWA2003719_HPP
 # include <boost/python/default_call_policies.hpp>
 # include <boost/python/detail/none.hpp>
+# include <boost/python/detail/value_arg.hpp>
 
 # include <boost/type_traits/add_reference.hpp>
 # include <boost/type_traits/add_const.hpp>
@@ -40,11 +41,7 @@ namespace detail
                   return true;
               }
               
-              PyObject *operator()(
-                  typename add_reference<
-                      typename add_const<T>::type
-                  >::type
-              ) const
+              PyObject *operator()( typename value_arg<T>::type ) const
               {
                   return none();
               }
diff --git a/include/boost/python/return_by_value.hpp b/include/boost/python/return_by_value.hpp
@@ -12,6 +12,8 @@
 # include <boost/type_traits/add_reference.hpp>
 # include <boost/type_traits/add_const.hpp>
 
+# include <boost/python/detail/value_arg.hpp>
+
 namespace boost { namespace python { 
 
 struct return_by_value
@@ -20,9 +22,7 @@ struct return_by_value
     struct apply
     {
        typedef to_python_value<
-           typename add_reference<
-               typename add_const<R>::type
-           >::type
+           typename detail::value_arg<R>::type
        > type;
     };
 };
diff --git a/include/boost/python/to_python_value.hpp b/include/boost/python/to_python_value.hpp
@@ -19,6 +19,7 @@
 # include <boost/python/converter/shared_ptr_to_python.hpp>
 
 # include <boost/python/detail/value_is_shared_ptr.hpp>
+# include <boost/python/detail/value_arg.hpp>
 
 # include <boost/type_traits/transform_traits.hpp>
 
@@ -32,9 +33,7 @@ namespace detail
   template <class T>
   struct object_manager_to_python_value
   {
-      typedef typename add_reference<
-          typename add_const<T>::type
-      >::type argument_type;
+      typedef typename value_arg<T>::type argument_type;
     
       PyObject* operator()(argument_type) const;
 
@@ -48,9 +47,7 @@ namespace detail
   template <class T>
   struct registry_to_python_value
   {
-      typedef typename add_reference<
-          typename add_const<T>::type
-      >::type argument_type;
+      typedef typename value_arg<T>::type argument_type;
     
       PyObject* operator()(argument_type) const;
 
@@ -63,9 +60,7 @@ namespace detail
   template <class T>
   struct shared_ptr_to_python_value
   {
-      typedef typename add_reference<
-          typename add_const<T>::type
-      >::type argument_type;
+      typedef typename value_arg<T>::type argument_type;
     
       PyObject* operator()(argument_type) const;
 
diff --git a/test/as_to_python_function.cpp b/test/as_to_python_function.cpp
@@ -4,7 +4,7 @@
 // "as is" without express or implied warranty, and with no claim as
 // to its suitability for any purpose.
 
-#include <boost/python/converter/to_python_function_type.hpp>
+#include <boost/python/converter/as_to_python_function.hpp>
 
 struct hopefully_illegal
 {

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`
`20`	`20`	`# include <boost/python/detail/indirect_traits.hpp>`
`21`	`21`	`# include <boost/python/detail/not_specified.hpp>`
	`22`	`+# include <boost/python/detail/value_arg.hpp>`
`22`	`23`
`23`	`24`	`# include <boost/type_traits/add_const.hpp>`
`24`	`25`	`# include <boost/type_traits/add_reference.hpp>`
`@@ -51,10 +52,6 @@ namespace detail`
`51`	`52`	`template <class Data, class Class>`
`52`	`53`	`struct member`
`53`	`54`	`{`
`54`		`- private:`
`55`		`- typedef typename add_const<Data>::type data_const;`
`56`		`- typedef typename add_reference<data_const>::type data_cref;`
`57`		`-`
`58`	`55`	`public:`
`59`	`56`	`member(Data Class::*which) : m_which(which) {}`
`60`	`57`
`@@ -63,7 +60,7 @@ namespace detail`
`63`	`60`	`return c.*m_which;`
`64`	`61`	`}`
`65`	`62`
`66`		`- void operator()(Class& c, data_cref d) const`
	`63`	`+ void operator()(Class& c, typename value_arg<Data>::type d) const`
`67`	`64`	`{`
`68`	`65`	`c.*m_which = d;`
`69`	`66`	`}`
`@@ -76,10 +73,6 @@ namespace detail`
`76`	`73`	`template <class Data>`
`77`	`74`	`struct datum`
`78`	`75`	`{`
`79`		`- private:`
`80`		`- typedef typename add_const<Data>::type data_const;`
`81`		`- typedef typename add_reference<data_const>::type data_cref;`
`82`		`-`
`83`	`76`	`public:`
`84`	`77`	`datum(Data *which) : m_which(which) {}`
`85`	`78`
`@@ -88,7 +81,7 @@ namespace detail`
`88`	`81`	`return *m_which;`
`89`	`82`	`}`
`90`	`83`
`91`		`- void operator()(data_cref d) const`
	`84`	`+ void operator()(typename value_arg<Data>::type d) const`
`92`	`85`	`{`
`93`	`86`	`*m_which = d;`
`94`	`87`	`}`
`@@ -112,11 +105,11 @@ namespace detail`
`112`	`105`	`: mpl::and_<`
`113`	`106`	`mpl::bool_<`
`114`	`107`	`to_python_value<`
`115`		`- typename add_reference<typename add_const<T>::type>::type`
	`108`	`+ typename value_arg<T>::type`
`116`	`109`	`>::uses_registry`
`117`	`110`	`>`
`118`	`111`	`, is_reference_to_class<`
`119`		`- typename add_reference<typename add_const<T>::type>::type`
	`112`	`+ typename value_arg<T>::type`
`120`	`113`	`>`
`121`	`114`	`>`
`122`	`115`	`{`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,8 @@ namespace api`
`176`	`176`	`# endif`
`177`	`177`
`178`	`178`	`private: // def visitation for adding callable objects as class methods`
	`179`	`+ using def_visitor<U>::visit;`
	`180`	`+`
`179`	`181`	`template <class ClassT, class DocStringT>`
`180`	`182`	`void visit(ClassT& cl, char const* name, python::detail::def_helper<DocStringT> const& helper) const`
`181`	`183`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`# define RETURN_ARG_DWA2003719_HPP`
`8`	`8`	`# include <boost/python/default_call_policies.hpp>`
`9`	`9`	`# include <boost/python/detail/none.hpp>`
	`10`	`+# include <boost/python/detail/value_arg.hpp>`
`10`	`11`
`11`	`12`	`# include <boost/type_traits/add_reference.hpp>`
`12`	`13`	`# include <boost/type_traits/add_const.hpp>`
`@@ -40,11 +41,7 @@ namespace detail`
`40`	`41`	`return true;`
`41`	`42`	`}`
`42`	`43`
`43`		`- PyObject *operator()(`
`44`		`- typename add_reference<`
`45`		`- typename add_const<T>::type`
`46`		`- >::type`
`47`		`- ) const`
	`44`	`+ PyObject *operator()( typename value_arg<T>::type ) const`
`48`	`45`	`{`
`49`	`46`	`return none();`
`50`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`// "as is" without express or implied warranty, and with no claim as`
`5`	`5`	`// to its suitability for any purpose.`
`6`	`6`
`7`		`-#include <boost/python/converter/to_python_function_type.hpp>`
	`7`	`+#include <boost/python/converter/as_to_python_function.hpp>`
`8`	`8`
`9`	`9`	`struct hopefully_illegal`
`10`	`10`	`{`