Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r58856 - trunk/boost/bimap
From: matias.capeletto_at_[hidden]
Date: 2010-01-09 17:11:41


Author: matias
Date: 2010-01-09 17:11:40 EST (Sat, 09 Jan 2010)
New Revision: 58856
URL: http://svn.boost.org/trac/boost/changeset/58856

Log:
fix custom allocators, ticket #3665
Text files modified:
   trunk/boost/bimap/bimap.hpp | 13 +++++++++----
   1 files changed, 9 insertions(+), 4 deletions(-)

Modified: trunk/boost/bimap/bimap.hpp
==============================================================================
--- trunk/boost/bimap/bimap.hpp (original)
+++ trunk/boost/bimap/bimap.hpp 2010-01-09 17:11:40 EST (Sat, 09 Jan 2010)
@@ -196,19 +196,24 @@
 
     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,7 +228,7 @@
     {}
 
     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,7 +236,7 @@
>(core)
         ),
 
- core(first,last),
+ core(first,last,BOOST_DEDUCED_TYPENAME base_::core_type::ctor_args_list(),al),
 
         left (
             ::boost::multi_index::get<


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk