Merged revision(s) 84341-85442 from trunk/boost/container. Merged revision(s) 84342-85442 from trunk/libs/container. First Container merge for 1.55

[SVN r85443]

test/check_equal_containers.hpp

@@ -48,8 +48,6 @@ bool CheckEqualContainers(const MyBoostCont *boostcont, const MyStdCont *stdcont
    if(boostcont->size() != stdcont->size())
       return false;
 
-   typedef typename MyBoostCont::value_type value_type;
-
    typename MyBoostCont::const_iterator itboost(boostcont->begin()), itboostend(boostcont->end());
    typename MyStdCont::const_iterator itstd(stdcont->begin());
    typename MyStdCont::size_type dist = (typename MyStdCont::size_type)std::distance(itboost, itboostend);

test/flat_tree_test.cpp

@@ -475,6 +475,13 @@ int main()
 {
    using namespace boost::container::test;
 
+   //Allocator argument container
+   {
+      flat_set<int> set_((std::allocator<int>()));
+      flat_multiset<int> multiset_((std::allocator<int>()));
+      flat_map<int, int> map_((std::allocator<std::pair<int, int> >()));
+      flat_multimap<int, int> multimap_((std::allocator<std::pair<int, int> >()));
+   }
    //Now test move semantics
    {
       test_move<flat_set<recursive_flat_set> >();

test/list_test.cpp

@@ -34,10 +34,10 @@ template class boost::container::list<test::movable_and_copyable_int,
 
 namespace container_detail {
 
-template class list_const_iterator
-   <int, intrusive_list_type< std::allocator<int> >::container_type::iterator >;
-template class list_iterator
-   <int, intrusive_list_type< std::allocator<int> >::container_type::iterator>;
+template class iterator
+   <intrusive_list_type< std::allocator<int> >::container_type::iterator, true >;
+template class iterator
+   <intrusive_list_type< std::allocator<int> >::container_type::iterator, false>;
 
 }
 

test/slist_test.cpp

@@ -31,15 +31,6 @@ template class boost::container::slist<test::movable_and_copyable_int,
 template class boost::container::slist<test::movable_and_copyable_int,
    std::allocator<test::movable_and_copyable_int> >;
 
-namespace container_detail {
-
-template class slist_const_iterator
-   <int, intrusive_slist_type< std::allocator<int> >::container_type::iterator >;
-template class slist_iterator
-   <int, intrusive_slist_type< std::allocator<int> >::container_type::iterator>;
-
-}
-
 }}
 
 typedef slist<int> MyList;

test/stable_vector_test.cpp

@@ -41,10 +41,10 @@ template class stable_vector<test::movable_and_copyable_int,
 
 namespace stable_vector_detail{
 
-template class iterator< int, int &, int *>;
-template class iterator< int, const int &, const int *>;
+template class iterator<int*, false>;
+template class iterator<int*, true >;
 
-}
+}  //namespace stable_vector_detail{
 
 }}
 

test/tree_test.cpp

@@ -247,6 +247,13 @@ int main ()
       map<recursive_map, recursive_map> map_;
       multimap<recursive_multimap, recursive_multimap> multimap_;
    }
+   //Allocator argument container
+   {
+      set<int> set_((std::allocator<int>()));
+      multiset<int> multiset_((std::allocator<int>()));
+      map<int, int> map_((std::allocator<std::pair<const int, int> >()));
+      multimap<int, int> multimap_((std::allocator<std::pair<const int, int> >()));
+   }
    //Now test move semantics
    {
       test_move<set<recursive_set> >();
@@ -255,7 +262,6 @@ int main ()
       test_move<multimap<recursive_multimap, recursive_multimap> >();
    }
 
-   //using namespace boost::container::detail;
 
    if(0 != test::set_test<MyBoostSet
                         ,MyStdSet

test/vector_test.cpp

@@ -43,8 +43,8 @@ namespace container_detail {
 
 #ifndef BOOST_CONTAINER_VECTOR_ITERATOR_IS_POINTER
 
-template class vector_const_iterator<int*>;
-template class vector_iterator<int*>;
+template class vec_iterator<int*, true >;
+template class vec_iterator<int*, false>;
 
 #endif   //BOOST_CONTAINER_VECTOR_ITERATOR_IS_POINTER