|
From: <rom...@us...> - 2006-11-20 20:20:17
|
Revision: 737
http://svn.sourceforge.net/pygccxml/?rev=737&view=rev
Author: roman_yakovenko
Date: 2006-11-20 12:20:17 -0800 (Mon, 20 Nov 2006)
Log Message:
-----------
testing solution and making it work
Modified Paths:
--------------
pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/sconstruct
pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/solution.cpp
pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/test.py
Modified: pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/sconstruct
===================================================================
--- pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/sconstruct 2006-11-20 13:27:21 UTC (rev 736)
+++ pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/sconstruct 2006-11-20 20:20:17 UTC (rev 737)
@@ -1,6 +1,6 @@
#scons build script
-SharedLibrary( target=r'custom_sptr'
- , source=[ r'bindings.cpp' ]
+SharedLibrary( target=r'shared_ptr'
+ , source=[ r'solution.cpp' ]
, LIBS=[ r"boost_python" ]
, LIBPATH=[ r"/home/roman/boost_cvs/bin",r"" ]
, CPPPATH=[ r"/home/roman/boost_cvs"
Modified: pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/solution.cpp
===================================================================
--- pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/solution.cpp 2006-11-20 13:27:21 UTC (rev 736)
+++ pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/solution.cpp 2006-11-20 20:20:17 UTC (rev 737)
@@ -1,9 +1,24 @@
#include "boost/python.hpp"
-#include "boost/shared_ptr.hpp"
#include <string>
-//Your code:
+namespace boost{
+
+ template<class T>
+ inline T* get_pointer( boost::shared_ptr<const T> const& p ){
+ return const_cast< T* >( p.get() );
+ }
+}
+
+namespace boost{ namespace python{
+
+ template<class T>
+ struct pointee< boost::shared_ptr<T const> >{
+ typedef T type;
+ };
+
+} } //boost::python
+
struct info_t{
//class info_t records in what function it was created information
info_t( const std::string& n )
@@ -17,11 +32,11 @@
typedef boost::shared_ptr< const info_t > const_ptr_t;
ptr_t create_ptr(){
- return ptr_t( new fruit( "ptr" ) );
+ return ptr_t( new info_t( "ptr" ) );
}
const_ptr_t create_const_ptr(){
- return const_ptr_t( new fruit( "const ptr" ) );
+ return const_ptr_t( new info_t( "const ptr" ) );
}
std::string read_ptr( ptr_t x ){
@@ -36,27 +51,12 @@
return x->text;
}
-
-namespace boost{ namespace python{
-
- template<class T>
- inline T* get_pointer( boost::shared_ptr<const T> const& p ){
- return const_cast<T*>(p.get());
- }
-
- template<class T>
- struct pointee< boost::shared_ptr<const T> >{
- typedef T type;
- };
-
-} } //boost::python
-
namespace bpl = boost::python;
namespace utils{
template< class T >
- register_shared_ptrs_to_python(){
+ void register_shared_ptrs_to_python(){
//small helper function, which will register shared_ptr conversions
bpl::register_ptr_to_python< boost::shared_ptr< T > >();
bpl::register_ptr_to_python< boost::shared_ptr< const T > >();
@@ -66,8 +66,9 @@
}
BOOST_PYTHON_MODULE( shared_ptr ){
- bpl::class_< fruit >( "fruit", bp::init< std::string >() );
- utils::register_shared_ptrs_to_python< fruit >();
+ bpl::class_< info_t >( "info_t", bpl::init< std::string >() )
+ .add_property( "text", &info_t::text );
+ utils::register_shared_ptrs_to_python< info_t >();
bpl::def( "create_ptr", &create_ptr );
bpl::def( "create_const_ptr", &create_const_ptr );
Modified: pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/test.py
===================================================================
--- pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/test.py 2006-11-20 13:27:21 UTC (rev 736)
+++ pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/test.py 2006-11-20 20:20:17 UTC (rev 737)
@@ -8,13 +8,14 @@
def test( self ):
ptr = shared_ptr.create_ptr()
- self.failUnless( ptr.name == "ptr" )
+ self.failUnless( ptr.text == "ptr" )
self.failUnless( shared_ptr.read_ptr( ptr ) == "ptr" )
const_ptr = shared_ptr.create_const_ptr()
- self.failUnless( const_ptr.name == "const ptr" )
+ self.failUnless( const_ptr.text == "const ptr" )
self.failUnless( shared_ptr.read_const_ptr( const_ptr ) == "const ptr" )
+ #testing conversion functionality
self.failUnless( shared_ptr.read_const_ptr( ptr ) == "ptr" )
def create_suite():
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rom...@us...> - 2006-12-21 06:27:28
|
Revision: 809
http://svn.sourceforge.net/pygccxml/?rev=809&view=rev
Author: roman_yakovenko
Date: 2006-12-20 22:27:28 -0800 (Wed, 20 Dec 2006)
Log Message:
-----------
adding doc
Modified Paths:
--------------
pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/shared_ptr.rest
Added Paths:
-----------
pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch
pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch.rest
Added: pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch
===================================================================
--- pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch (rev 0)
+++ pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch 2006-12-21 06:27:28 UTC (rev 809)
@@ -0,0 +1,99 @@
+*** pointer_holder.hpp.orig 2006-11-24 22:39:59.000000000 +0200
+--- pointer_holder.hpp 2006-12-08 20:05:58.000000000 +0200
+***************
+*** 35,40 ****
+--- 35,42 ----
+
+ # include <boost/detail/workaround.hpp>
+
++ # include <boost/type_traits/remove_const.hpp>
++
+ namespace boost { namespace python {
+
+ template <class T> class wrapper;
+***************
+*** 122,146 ****
+ template <class Pointer, class Value>
+ void* pointer_holder<Pointer, Value>::holds(type_info dst_t, bool null_ptr_only)
+ {
+ if (dst_t == python::type_id<Pointer>()
+ && !(null_ptr_only && get_pointer(this->m_p))
+ )
+ return &this->m_p;
+!
+! Value* p = get_pointer(this->m_p);
+ if (p == 0)
+ return 0;
+
+ if (void* wrapped = holds_wrapped(dst_t, p, p))
+ return wrapped;
+
+! type_info src_t = python::type_id<Value>();
+ return src_t == dst_t ? p : find_dynamic_type(p, src_t, dst_t);
+ }
+
+ template <class Pointer, class Value>
+ void* pointer_holder_back_reference<Pointer, Value>::holds(type_info dst_t, bool null_ptr_only)
+ {
+ if (dst_t == python::type_id<Pointer>()
+ && !(null_ptr_only && get_pointer(this->m_p))
+ )
+--- 124,153 ----
+ template <class Pointer, class Value>
+ void* pointer_holder<Pointer, Value>::holds(type_info dst_t, bool null_ptr_only)
+ {
++ typedef typename boost::remove_const< Value >::type NonConstValue;
++
+ if (dst_t == python::type_id<Pointer>()
+ && !(null_ptr_only && get_pointer(this->m_p))
+ )
+ return &this->m_p;
+!
+! Value* tmp = get_pointer(this->m_p);
+! NonConstValue* p = const_cast<NonConstValue*>( tmp );
+ if (p == 0)
+ return 0;
+
+ if (void* wrapped = holds_wrapped(dst_t, p, p))
+ return wrapped;
+
+! type_info src_t = python::type_id<NonConstValue>();
+ return src_t == dst_t ? p : find_dynamic_type(p, src_t, dst_t);
+ }
+
+ template <class Pointer, class Value>
+ void* pointer_holder_back_reference<Pointer, Value>::holds(type_info dst_t, bool null_ptr_only)
+ {
++ typedef typename boost::remove_const< Value >::type NonConstValue;
++
+ if (dst_t == python::type_id<Pointer>()
+ && !(null_ptr_only && get_pointer(this->m_p))
+ )
+***************
+*** 149,160 ****
+ if (!get_pointer(this->m_p))
+ return 0;
+
+! Value* p = get_pointer(m_p);
+
+ if (dst_t == python::type_id<held_type>())
+ return p;
+
+! type_info src_t = python::type_id<Value>();
+ return src_t == dst_t ? p : find_dynamic_type(p, src_t, dst_t);
+ }
+
+--- 156,168 ----
+ if (!get_pointer(this->m_p))
+ return 0;
+
+! Value* tmp = get_pointer(this->m_p);
+! NonConstValue* p = const_cast<NonConstValue*>( tmp );
+
+ if (dst_t == python::type_id<held_type>())
+ return p;
+
+! type_info src_t = python::type_id<NonConstValue>();
+ return src_t == dst_t ? p : find_dynamic_type(p, src_t, dst_t);
+ }
+
Added: pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch.rest
===================================================================
--- pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch.rest (rev 0)
+++ pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/pointer_holder.hpp.patch.rest 2006-12-21 06:27:28 UTC (rev 809)
@@ -0,0 +1,3 @@
+.. code-block::
+ :language: diff
+ :source-file: ./pointer_holder.hpp.patch
Modified: pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/shared_ptr.rest
===================================================================
--- pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/shared_ptr.rest 2006-12-21 05:44:30 UTC (rev 808)
+++ pyplusplus_dev/docs/bpl_lessons_learned/shared_ptr/shared_ptr.rest 2006-12-21 06:27:28 UTC (rev 809)
@@ -10,46 +10,57 @@
.. include:: ./definition.rest
---------
-Solution
---------
+---------
+Solutions
+---------
-The solution is pretty simple:
+There are two possible solutions to the problem. The first one is to fix
+Boost.Python library: `pointer_holder.hpp.patch`_ . The patch was contributed
+to the library ( 8-December-2006 ) and some day it will be commited to the CVS.
+It is also possible to solve the problem, without changing Boost.Python library:
+
.. code-block:: C++
- namespace boost{ namespace python{
+ namespace boost{
+
+ template<class T>
+ inline T* get_pointer( boost::shared_ptr<const T> const& p ){
+ return const_cast< T* >( p.get() );
+ }
+
+ }
+
+ namespace boost{ namespace python{
+
+ template<class T>
+ struct pointee< boost::shared_ptr<T const> >{
+ typedef T type;
+ };
+
+ } } //boost::python
- template<class T>
- inline T* get_pointer( boost::shared_ptr<const T> const& p ){
- return const_cast<T*>(p.get());
- }
-
- template<class T>
- struct pointee< boost::shared_ptr<const T> >{
- typedef T type;
- };
-
- } } //boost::python
-
- namespace utils{
-
- template< class T >
- register_shared_ptrs_to_python(){
- namespace bpl = boost::python;
- bpl::register_ptr_to_python< boost::shared_ptr< T > >();
- bpl::register_ptr_to_python< boost::shared_ptr< const T > >();
- bpl::implicitly_convertible< boost::shared_ptr< T >, boost::shared_ptr< const T > >();
- }
-
- }
-
- BOOST_PYTHON_MODULE(...){
- class_< YourClass >( "YourClass" )
- ...;
- utils::register_shared_ptrs_to_python< YourClass >();
- }
+ namespace utils{
+
+ template< class T >
+ register_shared_ptrs_to_python(){
+ namespace bpl = boost::python;
+ bpl::register_ptr_to_python< boost::shared_ptr< T > >();
+ bpl::register_ptr_to_python< boost::shared_ptr< const T > >();
+ bpl::implicitly_convertible< boost::shared_ptr< T >, boost::shared_ptr< const T > >();
+ }
+
+ }
+
+ BOOST_PYTHON_MODULE(...){
+ class_< YourClass >( "YourClass" )
+ ...;
+ utils::register_shared_ptrs_to_python< YourClass >();
+ }
+The second approach is a little bit "evil" because it redefines ``get_pointer``
+function for all shared pointer classes. So you should be careful.
+
Files
-----
@@ -62,11 +73,14 @@
* `test.py`_ file contains complete unit tests for the exposed classes
+* `pointer_holder.hpp.patch`_ file contains patch for the library
+
All files contain comments, which describe what and why was done.
-.. _`solution.cpp` : ./solution.hpp.html
+.. _`solution.cpp` : ./solution.cpp.html
.. _`sconstruct` : ./sconstruct.html
.. _`test.py` : ./test.py.html
+.. _`pointer_holder.hpp.patch` : ./pointer_holder.hpp.patch.html
--------
Download
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
