Index: libcxx/include/memory =================================================================== --- libcxx/include/memory +++ libcxx/include/memory @@ -1459,24 +1459,28 @@ #else // _LIBCPP_CXX03_LANG -#ifndef _LIBCPP_HAS_NO_VARIADICS - -template -struct __has_construct - : false_type +template +struct __has_construct_test { -}; +private: + template static true_type __test(void (_Xp::*)(_Pointer, _Args)); + template static false_type __test(...); -#else // _LIBCPP_HAS_NO_VARIADICS + template + static decltype(__test(&_Xp::construct)) __test_exist(decltype(&_Xp::construct)); + template static false_type __test_exist(...); + + typedef decltype(__test_exist<_Alloc>(0)) type; +public: + static const bool value = type::value; +}; template struct __has_construct - : false_type + : integral_constant::value> { }; -#endif // _LIBCPP_HAS_NO_VARIADICS - template struct __has_destroy : false_type @@ -1570,9 +1574,10 @@ } template _LIBCPP_INLINE_VISIBILITY - static void construct(allocator_type&, _Tp* __p, const _A0& __a0) + static void construct(allocator_type& __a, _Tp* __p, const _A0& __a0) { - ::new ((void*)__p) _Tp(__a0); + __construct(__has_construct(), + __a, __p, __a0); } template _LIBCPP_INLINE_VISIBILITY @@ -1720,6 +1725,19 @@ { ::new ((void*)__p) _Tp(_VSTD::forward<_Args>(__args)...); } +#else // _LIBCPP_HAS_NO_VARIADICS + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(true_type, allocator_type& __a, _Tp* __p, + const _A0& __a0) + {__a.construct(__p, __a0);} + template + _LIBCPP_INLINE_VISIBILITY + static void __construct(false_type, allocator_type&, _Tp* __p, + const _A0& __a0) + { + ::new ((void*)__p) _Tp(__a0); + } #endif // _LIBCPP_HAS_NO_VARIADICS template Index: libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp =================================================================== --- libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp +++ libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp @@ -50,6 +50,26 @@ #endif +template +struct cpp03_allocator : bare_allocator { + typedef T value_type; + typedef value_type* pointer; + + static bool construct_called; + + void construct(pointer p, const value_type& val) + { + ::new(p) value_type(val); + construct_called = true; + } + + std::size_t max_size() const + { + return UINT_MAX / sizeof(T); + } +}; +template bool cpp03_allocator::construct_called = false; + void basic_tests() { { int a[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4, 3, 1, 0}; @@ -129,9 +149,22 @@ } void test_ctor_under_alloc() { -#if TEST_STD_VER >= 11 int arr1[] = {42}; int arr2[] = {1, 101, 42}; + { + typedef std::vector > C; + { + cpp03_allocator::construct_called = false; + C v(arr1, arr1 + 1); + assert(cpp03_allocator::construct_called); + } + { + cpp03_allocator::construct_called = false; + C v(arr2, arr2 + 3); + assert(cpp03_allocator::construct_called); + } + } +#if TEST_STD_VER >= 11 { using C = TCT::vector<>; using T = typename C::value_type;