diff --git a/include/boost/python/converter/rvalue_from_python_data.hpp b/include/boost/python/converter/rvalue_from_python_data.hpp index f30ceadb..658cedb6 100644 --- a/include/boost/python/converter/rvalue_from_python_data.hpp +++ b/include/boost/python/converter/rvalue_from_python_data.hpp @@ -129,7 +129,7 @@ template inline rvalue_from_python_data::~rvalue_from_python_data() { if (this->stage1.convertible == this->storage.bytes) - python::detail::destroy_reference(this->storage.bytes); + python::detail::destroy_referent(this->storage.bytes); } }}} // namespace boost::python::converter diff --git a/include/boost/python/detail/destroy.hpp b/include/boost/python/detail/destroy.hpp index 07738e2f..89e82f73 100644 --- a/include/boost/python/detail/destroy.hpp +++ b/include/boost/python/detail/destroy.hpp @@ -62,7 +62,7 @@ struct value_destroyer }; template -inline void destroy_reference_impl(void* p, T& (*)()) +inline void destroy_referent_impl(void* p, T& (*)()) { // note: cv-qualification needed for MSVC6 // must come *before* T for metrowerks @@ -73,9 +73,9 @@ inline void destroy_reference_impl(void* p, T& (*)()) } template -inline void destroy_reference(void* p, T(*)() = 0) +inline void destroy_referent(void* p, T(*)() = 0) { - destroy_reference_impl(p, (T(*)())0); + destroy_referent_impl(p, (T(*)())0); } }}} // namespace boost::python::detail diff --git a/test/destroy_test.cpp b/test/destroy_test.cpp index c6be42fc..38d5d1d5 100644 --- a/test/destroy_test.cpp +++ b/test/destroy_test.cpp @@ -5,7 +5,7 @@ struct bar; namespace boost { - // lie to the library about bar so we can show that it's destructor is optimized away. + // lie to the library about bar so we can show that its destructor is optimized away. template <> struct has_trivial_destructor { @@ -48,33 +48,33 @@ int main() typedef int a[2]; foo* f1 = new foo; - boost::python::detail::destroy_reference(f1); + boost::python::detail::destroy_referent(f1); assert_destructions(1); foo* f2 = new foo[2]; typedef foo x[2]; - boost::python::detail::destroy_reference(f2); + boost::python::detail::destroy_referent(f2); assert_destructions(3); typedef foo y[2][2]; x* f3 = new y; - boost::python::detail::destroy_reference(f3); + boost::python::detail::destroy_referent(f3); assert_destructions(7); bar* b1 = new bar; - boost::python::detail::destroy_reference(b1); + boost::python::detail::destroy_referent(b1); assert_destructions(7); bar* b2 = new bar[2]; typedef bar xb[2]; - boost::python::detail::destroy_reference(b2); + boost::python::detail::destroy_referent(b2); assert_destructions(7); typedef bar yb[2][2]; xb* b3 = new yb; - boost::python::detail::destroy_reference(b3); + boost::python::detail::destroy_referent(b3); assert_destructions(7); return 0;