Ticket #3665: bimap-allocator.2.patch

boost/bimap/bimap.hpp

@@ -190 +190 @@
          left_map::const_reference  left_const_reference;
 
     typedef BOOST_DEDUCED_TYPENAME
-        right_map::reference       right_reference;
+    right_map::reference       right_reference;
     typedef BOOST_DEDUCED_TYPENAME
         right_map::const_reference right_const_reference;
 
     typedef BOOST_DEDUCED_TYPENAME base_::relation::info_type info_type;
 
+    typedef BOOST_DEDUCED_TYPENAME base_::core_type::allocator_type allocator_type;
+    
     /// Left map view
     left_map  left;
 
     /// Right map view
     right_map right;
 
-    bimap() :
+  bimap(const allocator_type& al = allocator_type()) :
 
         base_::relation_set(
             ::boost::multi_index::get<
                 BOOST_DEDUCED_TYPENAME base_::logic_relation_set_tag 
             >(core) 
         ),
+        core(al),
         left (
             ::boost::multi_index::get<
                 BOOST_DEDUCED_TYPENAME base_::logic_left_tag
@@ -223 +226 @@
     {}
 
     template< class InputIterator >
-    bimap(InputIterator first,InputIterator last) :
+    bimap(InputIterator first,InputIterator last,const allocator_type& al = allocator_type()) :
 
         base_::relation_set(
             ::boost::multi_index::get<
@@ -231 +234 @@
             >(core) 
         ),
 
-        core(first,last),
+        core(first,last,BOOST_DEDUCED_TYPENAME base_::core_type::ctor_args_list(),al),
 
         left (
             ::boost::multi_index::get<