Fixes from trunk for 1.49

[SVN r76264]
2012-01-01 19:14:12 +00:00
parent 0aafb2f9be
commit a1a1968d9c
5 changed files with 67 additions and 145 deletions
@@ -1328,7 +1328,7 @@ class vector : private container_detail::vector_alloc_holder<A>
   template<class AllocVersion>
   void priv_shrink_to_fit(AllocVersion
                          , typename container_detail::enable_if_c<
-                              container_detail::is_same<AllocVersion, allocator_v2>::value >::type * = 0)
+                              !container_detail::is_same<AllocVersion, allocator_v1>::value >::type * = 0)
   {
      if(this->members_.m_capacity){
         if(!size()){