Reduce redundant instantiations to improve test build times

test/map_test.cpp

@@ -9,8 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/container/detail/config_begin.hpp>
 #include <boost/container/map.hpp>
-#include <boost/container/allocator.hpp>
-#include <boost/container/node_allocator.hpp>
 #include <boost/container/adaptive_pool.hpp>
 
 #include <map>
@@ -31,14 +29,6 @@ namespace container {
 //Explicit instantiation to detect compilation errors
 
 //map
-template class map
-   < test::movable_and_copyable_int
-   , test::movable_and_copyable_int
-   , std::less<test::movable_and_copyable_int>
-   , test::dummy_test_allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   >;
-
 template class map
    < test::movable_and_copyable_int
    , test::movable_and_copyable_int
@@ -55,15 +45,6 @@ template class map
       < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
    >;
 
-
-template class map
-   < test::movable_and_copyable_int
-   , test::movable_and_copyable_int
-   , std::less<test::movable_and_copyable_int>
-   , allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   >;
-
 template class map
    < test::movable_and_copyable_int
    , test::movable_and_copyable_int
@@ -72,23 +53,7 @@ template class map
       < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
    >;
 
-template class map
-   < test::movable_and_copyable_int
-   , test::movable_and_copyable_int
-   , std::less<test::movable_and_copyable_int>
-   , node_allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   >;
-
 //multimap
-template class multimap
-   < test::movable_and_copyable_int
-   , test::movable_and_copyable_int
-   , std::less<test::movable_and_copyable_int>
-   , test::dummy_test_allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   >;
-
 template class multimap
    < test::movable_and_copyable_int
    , test::movable_and_copyable_int
@@ -105,14 +70,6 @@ template class multimap
       < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
    >;
 
-template class multimap
-   < test::movable_and_copyable_int
-   , test::movable_and_copyable_int
-   , std::less<test::movable_and_copyable_int>
-   , allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   >;
-
 template class multimap
    < test::movable_and_copyable_int
    , test::movable_and_copyable_int
@@ -121,25 +78,8 @@ template class multimap
       < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
    >;
 
-template class multimap
-   < test::movable_and_copyable_int
-   , test::movable_and_copyable_int
-   , std::less<test::movable_and_copyable_int>
-   , node_allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   >;
-
 namespace container_detail {
 
-template class tree
-   < const test::movable_and_copyable_int
-   , std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int>
-   , container_detail::select1st< std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   , std::less<test::movable_and_copyable_int>
-   , test::dummy_test_allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   , tree_assoc_defaults >;
-
 template class tree
    < const test::movable_and_copyable_int
    , std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int>
@@ -158,15 +98,6 @@ template class tree
       < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
    , tree_assoc_defaults >;
 
-template class tree
-   < const test::movable_and_copyable_int
-   , std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int>
-   , container_detail::select1st< std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   , std::less<test::movable_and_copyable_int>
-   , allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   , tree_assoc_defaults >;
-
 template class tree
    < const test::movable_and_copyable_int
    , std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int>
@@ -176,15 +107,6 @@ template class tree
       < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
    , tree_assoc_defaults >;
 
-template class tree
-   < const test::movable_and_copyable_int
-   , std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int>
-   , container_detail::select1st< std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   , std::less<test::movable_and_copyable_int>
-   , node_allocator
-      < std::pair<const test::movable_and_copyable_int, test::movable_and_copyable_int> >
-   , tree_assoc_defaults >;
-
 }  //container_detail {
 
 }} //boost::container
@@ -376,16 +298,6 @@ int main ()
       std::cerr << "test_map_variants< std::allocator<void> > failed" << std::endl;
       return 1;
    }
-   //       boost::container::allocator
-   if(test_map_variants< allocator<void>, red_black_tree >()){
-      std::cerr << "test_map_variants< allocator<void> > failed" << std::endl;
-      return 1;
-   }
-   //       boost::container::node_allocator
-   if(test_map_variants< node_allocator<void>, red_black_tree >()){
-      std::cerr << "test_map_variants< node_allocator<void> > failed" << std::endl;
-      return 1;
-   }
    //       boost::container::adaptive_pool
    if(test_map_variants< adaptive_pool<void>, red_black_tree >()){
       std::cerr << "test_map_variants< adaptive_pool<void> > failed" << std::endl;