|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62808 - in trunk: boost/python/converter libs/python/src/converter
From: steven_at_[hidden]
Date: 2010-06-11 14:06:26
Author: steven_watanabe
Date: 2010-06-11 14:06:25 EDT (Fri, 11 Jun 2010)
New Revision: 62808
URL: http://svn.boost.org/trac/boost/changeset/62808
Log:
Use the convertible_function typedef instead of the raw function pointer type. Fixes #903
Text files modified:
trunk/boost/python/converter/registry.hpp | 2 +-
trunk/libs/python/src/converter/registry.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
Modified: trunk/boost/python/converter/registry.hpp
==============================================================================
--- trunk/boost/python/converter/registry.hpp (original)
+++ trunk/boost/python/converter/registry.hpp 2010-06-11 14:06:25 EDT (Fri, 11 Jun 2010)
@@ -30,7 +30,7 @@
BOOST_PYTHON_DECL void insert(to_python_function_t, type_info, PyTypeObject const* (*to_python_target_type)() = 0);
// Insert an lvalue from_python converter
- BOOST_PYTHON_DECL void insert(void* (*convert)(PyObject*), type_info, PyTypeObject const* (*expected_pytype)() = 0);
+ BOOST_PYTHON_DECL void insert(convertible_function, type_info, PyTypeObject const* (*expected_pytype)() = 0);
// Insert an rvalue from_python converter
BOOST_PYTHON_DECL void insert(
Modified: trunk/libs/python/src/converter/registry.cpp
==============================================================================
--- trunk/libs/python/src/converter/registry.cpp (original)
+++ trunk/libs/python/src/converter/registry.cpp 2010-06-11 14:06:25 EDT (Fri, 11 Jun 2010)
@@ -243,7 +243,7 @@
}
// Insert an rvalue from_python converter
- void insert(void* (*convertible)(PyObject*)
+ void insert(convertible_function convertible
, constructor_function construct
, type_info key
, PyTypeObject const* (*exp_pytype)())
@@ -261,7 +261,7 @@
}
// Insert an rvalue from_python converter
- void push_back(void* (*convertible)(PyObject*)
+ void push_back(convertible_function convertible
, constructor_function construct
, type_info key
, PyTypeObject const* (*exp_pytype)())
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk