From 12988b879e344446decf84bcf6764383bf7e1c50 Mon Sep 17 00:00:00 2001 From: Dave Abrahams Date: Sat, 2 Feb 2002 08:31:11 +0000 Subject: [PATCH] *** empty log message *** [SVN r12627] --- include/boost/python/copy_const_reference.hpp | 4 ++-- include/boost/python/copy_non_const_reference.hpp | 4 ++-- include/boost/python/default_call_policies.hpp | 12 ++++++++---- include/boost/python/make_function.hpp | 6 ------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/include/boost/python/copy_const_reference.hpp b/include/boost/python/copy_const_reference.hpp index 55e8f87f..57c45fd4 100644 --- a/include/boost/python/copy_const_reference.hpp +++ b/include/boost/python/copy_const_reference.hpp @@ -21,7 +21,7 @@ namespace detail ; } -template struct to_python; +template struct to_python_value; struct copy_const_reference { @@ -30,7 +30,7 @@ struct copy_const_reference { typedef typename mpl::select_type< detail::is_reference_to_const::value - , to_python + , to_python_value , detail::copy_const_reference_expects_a_const_reference_return_type >::type type; }; diff --git a/include/boost/python/copy_non_const_reference.hpp b/include/boost/python/copy_non_const_reference.hpp index 4afdc369..dead736f 100644 --- a/include/boost/python/copy_non_const_reference.hpp +++ b/include/boost/python/copy_non_const_reference.hpp @@ -21,7 +21,7 @@ namespace detail ; } -template struct to_python; +template struct to_python_value; struct copy_non_const_reference { @@ -30,7 +30,7 @@ struct copy_non_const_reference { typedef typename mpl::select_type< boost::python::detail::is_reference_to_non_const::value - , to_python + , to_python_value , detail::copy_non_const_reference_expects_a_non_const_reference_return_type >::type type; }; diff --git a/include/boost/python/default_call_policies.hpp b/include/boost/python/default_call_policies.hpp index 3dc3d4d4..475278e4 100644 --- a/include/boost/python/default_call_policies.hpp +++ b/include/boost/python/default_call_policies.hpp @@ -7,10 +7,12 @@ # define DEFAULT_CALL_POLICIES_DWA2002131_HPP # include # include +# include +# include namespace boost { namespace python { -template struct to_python; +template struct to_python_value; namespace detail { @@ -49,7 +51,9 @@ struct default_result_converter typedef typename mpl::select_type< is_reference::value | is_pointer::value , detail::specify_a_result_policy_to_wrap_functions_returning - , to_python + , boost::python::to_python_value< + typename add_reference::type>::type + > >::type type; }; }; @@ -58,13 +62,13 @@ struct default_result_converter template <> struct default_result_converter::apply { - typedef boost::python::to_python type; + typedef boost::python::to_python_value type; }; template <> struct default_result_converter::apply { - typedef boost::python::to_python type; + typedef boost::python::to_python_value type; }; }} // namespace boost::python diff --git a/include/boost/python/make_function.hpp b/include/boost/python/make_function.hpp index 6f989256..90a5c12b 100644 --- a/include/boost/python/make_function.hpp +++ b/include/boost/python/make_function.hpp @@ -11,7 +11,6 @@ # include # include # include -# include # include # include # include @@ -22,7 +21,6 @@ namespace boost { namespace python { template objects::function* make_function(F f) { - converter::acquire_registrations(detail::signature(f)); return new objects::function( objects::py_function( ::boost::bind(detail::caller(), f, _1, _2, default_call_policies())) @@ -32,7 +30,6 @@ objects::function* make_function(F f) template objects::function* make_function(F f, Policies const& policies) { - converter::acquire_registrations(detail::signature(f)); return new objects::function( objects::py_function( ::boost::bind(detail::caller(), f, _1, _2, policies)) @@ -44,9 +41,6 @@ objects::function* make_constructor(T* = 0, ArgList* = 0, Generator* = 0) { enum { nargs = mpl::size::value }; - typedef typename mpl::push_front::sequence signature; - converter::acquire_registrations(signature()); - return new objects::function( objects::py_function( ::boost::bind(detail::caller(),