Map indexing fix for VC6.5

djowel · djowel · commit 4946af1448b0 · 2003-08-19T20:32:56.000Z
[SVN r19699]
diff --git a/include/boost/python/suite/indexing/indexing_suite.hpp b/include/boost/python/suite/indexing/indexing_suite.hpp
@@ -8,6 +8,7 @@
 # define INDEXING_SUITE_JDG20036_HPP
 
 # include <boost/python/class.hpp>
+# include <boost/python/def_visitor.hpp>
 # include <boost/python/register_ptr_to_python.hpp>
 # include <boost/python/suite/indexing/detail/indexing_suite_detail.hpp>
 # include <boost/python/return_internal_reference.hpp>
diff --git a/include/boost/python/suite/indexing/map_indexing_suite.hpp b/include/boost/python/suite/indexing/map_indexing_suite.hpp
@@ -53,14 +53,15 @@ namespace boost { namespace python {
           , DerivedPolicies
           , NoProxy
           , true
-          , typename Container::mapped_type
+          , typename Container::value_type::second_type
           , typename Container::key_type
           , typename Container::key_type
         >
     {      
     public:
     
-        typedef typename Container::mapped_type data_type;
+        typedef typename Container::value_type value_type;
+        typedef typename Container::value_type::second_type data_type;
         typedef typename Container::key_type key_type;
         typedef typename Container::key_type index_type;
         typedef typename Container::size_type size_type;
@@ -76,12 +77,12 @@ namespace boost { namespace python {
             elem_name += "_entry";
 
             typedef typename mpl::if_<
-                is_class<typename Container::mapped_type>
+                is_class<data_type>
               , return_internal_reference<>
               , default_call_policies
             >::type get_data_return_policy;
            
-            class_<typename Container::value_type>(elem_name.c_str())
+            class_<value_type>(elem_name.c_str())
                 .def("__repr__", &DerivedPolicies::print_elem)
                 .def("data", &DerivedPolicies::get_data, get_data_return_policy())
                 .def("key", &DerivedPolicies::get_key)
@@ -96,9 +97,9 @@ namespace boost { namespace python {
 
         static 
         typename mpl::if_<
-            is_class<typename Container::mapped_type>
-          , typename Container::mapped_type&
-          , typename Container::mapped_type
+            is_class<data_type>
+          , data_type&
+          , data_type
         >::type
         get_data(typename Container::value_type& e)
         {
