fixed bug where a vector<T*> is being wrapped by the indexing suite.

djowel · djowel · commit 980733a96d36 · 2005-07-07T14:00:31.000Z
[SVN r29930]
diff --git a/include/boost/python/suite/indexing/detail/indexing_suite_detail.hpp b/include/boost/python/suite/indexing/detail/indexing_suite_detail.hpp
@@ -11,6 +11,7 @@
 # include <boost/get_pointer.hpp>
 # include <boost/detail/binary_search.hpp>
 # include <boost/numeric/conversion/cast.hpp>
+# include <boost/type_traits/is_pointer.hpp>
 # include <vector>
 # include <map>
 #include <iostream>
@@ -462,13 +463,29 @@ namespace boost { namespace python { namespace detail {
         { 
         }
 
+        template <class DataType> 
+        static object
+        base_get_item_helper(DataType const& p, mpl::true_)
+        { 
+            return object(ptr(p));
+        }
+
+        template <class DataType> 
+        static object
+        base_get_item_helper(DataType const& x, mpl::false_)
+        { 
+            return object(x);
+        }
+
         static object
         base_get_item_(back_reference<Container&> const& container, PyObject* i)
         { 
-            return object(
+            return base_get_item_helper(
                 DerivedPolicies::get_item(
                     container.get(), DerivedPolicies::
-                        convert_index(container.get(), i)));
+                        convert_index(container.get(), i))
+              , is_pointer<BOOST_DEDUCED_TYPENAME Container::value_type>()
+            );
         }
 
         static void
diff --git a/test/Jamfile b/test/Jamfile
@@ -162,6 +162,8 @@ bpl-test crossmod_exception
 [ bpl-test docstring ]
 
 [ bpl-test vector_indexing_suite ]
+[ bpl-test pointer_vector ]
+
 
 [ extension map_indexing_suite_ext
     : map_indexing_suite.cpp int_map_indexing_suite.cpp <template>../build/extension ]
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
@@ -115,6 +115,7 @@ bpl-test crossmod_exception
 [ bpl-test docstring ]
 
 [ bpl-test vector_indexing_suite ]
+[ bpl-test pointer_vector ]
 
 [ python-extension map_indexing_suite_ext
     : map_indexing_suite.cpp int_map_indexing_suite.cpp
diff --git a/test/pointer_vector.cpp b/test/pointer_vector.cpp
@@ -0,0 +1,48 @@
+#include <vector>
+#include <boost/python.hpp>
+#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+
+using namespace boost::python;
+
+class Abstract
+{
+public:   
+    virtual std::string    f() =0;
+};
+
+class Concrete1 : public Abstract
+{
+public:   
+    virtual std::string    f()    { return "harru"; }
+};
+
+typedef std::vector<Abstract*>   ListOfObjects;
+
+class DoesSomething
+{
+public:
+    DoesSomething()    {}
+   
+    ListOfObjects   returnList()    
+    {
+        ListOfObjects lst; 
+        lst.push_back(new Concrete1()); return lst; 
+    }
+};
+
+BOOST_PYTHON_MODULE(pointer_vector_ext)
+{       
+class_<Abstract, boost::noncopyable>("Abstract", no_init)
+    .def("f", &Abstract::f)
+    ;
+
+class_<ListOfObjects>("ListOfObjects")
+   .def( vector_indexing_suite<ListOfObjects>() )  
+    ;
+
+class_<DoesSomething>("DoesSomething")
+    .def("returnList", &DoesSomething::returnList)
+    ;
+}
+
+
diff --git a/test/pointer_vector.py b/test/pointer_vector.py
@@ -0,0 +1,31 @@
+# Copyright Joel de Guzman 2004. Distributed under the Boost
+# Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+'''
+
+>>> import pointer_vector_ext
+>>> d = pointer_vector_ext.DoesSomething()
+>>> lst = d.returnList()
+>>> lst[0].f();
+'harru'
+
+'''
+
+
+def run(args = None):
+    import sys
+    import doctest
+
+    if args is not None:
+        sys.argv = args
+    return doctest.testmod(sys.modules.get(__name__))
+
+if __name__ == '__main__':
+    print 'running...'
+    import sys
+    status = run()[0]
+    if (status == 0): print "Done."
+    sys.exit(status)
+
+
+
