map bug fix when data type is a shared_ptr and NoProxy is true

djowel · djowel · commit 09e24cb17d09 · 2005-11-26T16:23:21.000Z
[SVN r31787]
diff --git a/include/boost/python/suite/indexing/map_indexing_suite.hpp b/include/boost/python/suite/indexing/map_indexing_suite.hpp
@@ -78,7 +78,7 @@ namespace boost { namespace python {
             elem_name += "_entry";
 
             typedef typename mpl::if_<
-                is_class<data_type>
+                mpl::and_<is_class<data_type>, mpl::bool_<!NoProxy> >
               , return_internal_reference<>
               , default_call_policies
             >::type get_data_return_policy;
@@ -98,7 +98,7 @@ namespace boost { namespace python {
 
         static
         typename mpl::if_<
-            is_class<data_type>
+            mpl::and_<is_class<data_type>, mpl::bool_<!NoProxy> >
           , data_type&
           , data_type
         >::type
diff --git a/test/map_indexing_suite.cpp b/test/map_indexing_suite.cpp
@@ -26,26 +26,6 @@ std::string x_value(X const& x)
     return "gotya " + x.s;
 }
 
-
-
-    struct domain
-    {};
-    
-    struct graph
-    {
-        typedef std::map <int, boost::shared_ptr <domain> > domains_t;
-        domains_t domains_;
-    };
-
-
-//  objects::class_value_wrapper <boost::shared_ptr<domain>,
-//     objects::make_ptr_instance <domain,
-//     objects::pointer_holder <boost::shared_ptr<domain>, domain> > > ();
-
-  
-  
-  
-
 BOOST_PYTHON_MODULE(map_indexing_suite_ext)
 {
     class_<X>("X")
@@ -74,20 +54,10 @@ BOOST_PYTHON_MODULE(map_indexing_suite_ext)
     ;
 #endif 
 
-    // Compile check only...
+    // Some more..
     class_<std::map<std::string, boost::shared_ptr<X> > >("TestMap")
-        .def(map_indexing_suite<std::map<std::string, boost::shared_ptr<X> > >())
+        .def(map_indexing_suite<std::map<std::string, boost::shared_ptr<X> >, true>())
     ;
-
-    // Some more...
-    class_<domain, boost::shared_ptr <domain> > ("domain");
-
-    class_<graph::domains_t> ("domains_map")
-        .def (map_indexing_suite<graph::domains_t, true> ());
-
-    class_<graph> ("graph")
-        .def_readonly ("domains", &graph::domains_);
-
 }
 
 #include "module_tail.cpp"
diff --git a/test/map_indexing_suite.py b/test/map_indexing_suite.py
@@ -191,10 +191,15 @@
 # Some more...
 #####################################################################
 
->>> g = graph()
->>> for el in g.domains:
+>>> tm = TestMap()
+>>> tm["joel"] = X("aaa")
+>>> tm["kimpo"] = X("bbb")
+>>> print_xmap(tm)
+[ (joel, aaa) (kimpo, bbb) ]
+>>> for el in tm:
 ...     print el.key(),
 ...     dom = el.data()
+joel kimpo
 
 #####################################################################
 # END.... 
