rvalue_data -> rvalue_from_python_data

dabrahams · dabrahams · commit 7d3227128c9c · 2002-07-08T21:35:18.000Z
[SVN r14357]
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
@@ -7,7 +7,7 @@
 #include <boost/python/detail/config.hpp>
 #include <boost/python/detail/wrap_python.hpp>
 #include <boost/python/converter/builtin_converters.hpp>
-#include <boost/python/converter/from_python_data.hpp>
+#include <boost/python/converter/rvalue_from_python_data.hpp>
 #include <boost/python/converter/registry.hpp>
 #include <boost/python/handle.hpp>
 #include <boost/python/type_id.hpp>
@@ -50,14 +50,14 @@ namespace
           return slot && *slot ? slot : 0;
       }
 
-      static void construct(PyObject* obj, rvalue_stage1_data* data)
+      static void construct(PyObject* obj, rvalue_from_python_stage1_data* data)
       {
           // Get the (intermediate) source object
           unaryfunc creator = *static_cast<unaryfunc*>(data->convertible);
           handle<> intermediate(creator(obj));
 
           // Get the location in which to construct
-          void* storage = ((rvalue_base_data<T>*)data)->storage.bytes;
+          void* storage = ((rvalue_from_python_storage<T>*)data)->storage.bytes;
           new (storage) T(SlotPolicy::extract(intermediate.get()));
 
           // record successful construction
diff --git a/src/converter/callback.cpp b/src/converter/callback.cpp
@@ -17,7 +17,7 @@ namespace detail
 
   namespace
   {
-    inline PyObject* convert(void const volatile* source, to_python_function_t converter)
+    inline PyObject* convert_to_python(void const volatile* source, to_python_function_t converter)
     {
         if (converter == 0)
         {
@@ -36,14 +36,14 @@ namespace detail
   arg_to_python_base::arg_to_python_base(
       void const volatile* source, to_python_function_t converter)
 # if !defined(BOOST_MSVC) || _MSC_FULL_VER != 13102140
-      : handle<>(convert(source, converter))
+      : handle<>(convert_to_python(source, converter))
 # else
-      : m_ptr(convert(source, converter))
+      : m_ptr(convert_to_python(source, converter))
 # endif 
   {
   }
 
-  BOOST_PYTHON_DECL void throw_if_not_registered(rvalue_stage1_data const& data)
+  BOOST_PYTHON_DECL void throw_if_not_registered(rvalue_from_python_stage1_data const& data)
   {
       if (!data.convertible)
       {
@@ -108,7 +108,7 @@ namespace detail
       throw_error_already_set();
   }
   
-  BOOST_PYTHON_DECL void* convert_rvalue(PyObject* src, rvalue_stage1_data& data, void* storage)
+  BOOST_PYTHON_DECL void* convert_rvalue(PyObject* src, rvalue_from_python_stage1_data& data, void* storage)
   {
       handle<> holder(src);
       
@@ -126,6 +126,11 @@ namespace detail
       
       return data.convertible;
   }
+
+  BOOST_PYTHON_DECL void absorb_result(PyObject* o)
+  {
+      Py_DECREF(expect_non_null(o));
+  }
 }   
 
 }}} // namespace boost::python::converter
diff --git a/src/converter/from_python.cpp b/src/converter/from_python.cpp
@@ -6,17 +6,19 @@
 
 #include <boost/python/converter/find_from_python.hpp>
 #include <boost/python/converter/registrations.hpp>
-#include <boost/python/converter/from_python_data.hpp>
+#include <boost/python/converter/rvalue_from_python_data.hpp>
+#include <boost/python/converter/registrations.hpp>
+#include <boost/python/detail/wrap_python.hpp>
 #include <vector>
 #include <algorithm>
 
 namespace boost { namespace python { namespace converter { 
 
-BOOST_PYTHON_DECL rvalue_stage1_data find(
+BOOST_PYTHON_DECL rvalue_from_python_stage1_data find(
     PyObject* source
     , rvalue_from_python_registration const* chain)
 {
-    rvalue_stage1_data data;
+    rvalue_from_python_stage1_data data;
     data.convertible = 0;
     for (;chain != 0; chain = chain->next)
     {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace detail`
`17`	`17`
`18`	`18`	`namespace`
`19`	`19`	`{`
`20`		`- inline PyObject* convert(void const volatile* source, to_python_function_t converter)`
	`20`	`+ inline PyObject* convert_to_python(void const volatile* source, to_python_function_t converter)`
`21`	`21`	`{`
`22`	`22`	`if (converter == 0)`
`23`	`23`	`{`
`@@ -36,14 +36,14 @@ namespace detail`
`36`	`36`	`arg_to_python_base::arg_to_python_base(`
`37`	`37`	`void const volatile* source, to_python_function_t converter)`
`38`	`38`	`# if !defined(BOOST_MSVC) \|\| _MSC_FULL_VER != 13102140`
`39`		`- : handle<>(convert(source, converter))`
	`39`	`+ : handle<>(convert_to_python(source, converter))`
`40`	`40`	`# else`
`41`		`- : m_ptr(convert(source, converter))`
	`41`	`+ : m_ptr(convert_to_python(source, converter))`
`42`	`42`	`# endif`
`43`	`43`	`{`
`44`	`44`	`}`
`45`	`45`
`46`		`- BOOST_PYTHON_DECL void throw_if_not_registered(rvalue_stage1_data const& data)`
	`46`	`+ BOOST_PYTHON_DECL void throw_if_not_registered(rvalue_from_python_stage1_data const& data)`
`47`	`47`	`{`
`48`	`48`	`if (!data.convertible)`
`49`	`49`	`{`
`@@ -108,7 +108,7 @@ namespace detail`
`108`	`108`	`throw_error_already_set();`
`109`	`109`	`}`
`110`	`110`
`111`		`- BOOST_PYTHON_DECL void* convert_rvalue(PyObject* src, rvalue_stage1_data& data, void* storage)`
	`111`	`+ BOOST_PYTHON_DECL void* convert_rvalue(PyObject* src, rvalue_from_python_stage1_data& data, void* storage)`
`112`	`112`	`{`
`113`	`113`	`handle<> holder(src);`
`114`	`114`
`@@ -126,6 +126,11 @@ namespace detail`
`126`	`126`
`127`	`127`	`return data.convertible;`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ BOOST_PYTHON_DECL void absorb_result(PyObject* o)`
	`131`	`+ {`
	`132`	`+ Py_DECREF(expect_non_null(o));`
	`133`	`+ }`
`129`	`134`	`}`
`130`	`135`
`131`	`136`	`}}} // namespace boost::python::converter`