Ticket #9064: select_on_conatiner_copy.patch

scoped_allocator.hpp

@@ -1250 +1250 @@
    //! the corresponding allocator in *this.
    scoped_allocator_adaptor select_on_container_copy_construction() const
    {
-      return scoped_allocator_adaptor
-         (internal_type_t()
-         ,outer_traits_type::select_on_container_copy_construction(this->outer_allocator())
-         ,inner_traits_type::select_on_container_copy_construction(this->inner_allocator())
-         );
+
+       #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_CONTAINER_DOXYGEN_INVOKED)  
+       const bool has_zero_inner = sizeof...(InnerAllocs) == 0u;
+       #else
+       const bool has_zero_inner =
+          boost::container::container_detail::is_same
+             <Q0, container_detail::nat>::value;
+       #endif
+
+       if (has_zero_inner) {
+           return scoped_allocator_adaptor
+               (internal_type_t()
+               ,outer_traits_type::select_on_container_copy_construction(this->outer_allocator())
+               ,this->inner_allocator()
+               );
+       } else {
+           return scoped_allocator_adaptor
+                (internal_type_t()
+                ,outer_traits_type::select_on_container_copy_construction(this->outer_allocator())
+                ,this->inner_allocator()
+                //,inner_traits_type::select_on_container_copy_construction(this->inner_allocator())
+                );
+       }
    }
    /// @cond
    base_type &base()             { return *this; }