From 838b5fb920aa00ca0da70cb297063060e43eaace Mon Sep 17 00:00:00 2001 From: Alfredo Correa Date: Wed, 10 Feb 2021 23:35:17 -0800 Subject: [PATCH] Squashed 'external_codes/boost_multi/multi/' changes from 03f140657..546294f8a 546294f8a Merge branch 'afq_dev_adl' into 'master' 00da14c7a detele unused param 4a380f1ce fallback to uninit from alloc_uninit git-subtree-dir: external_codes/boost_multi/multi git-subtree-split: 546294f8a14bbdba3825bb24baacea6161d5642e --- detail/adl.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/detail/adl.hpp b/detail/adl.hpp index 1e228d4b4..27f85e2b9 100644 --- a/detail/adl.hpp +++ b/detail/adl.hpp @@ -474,10 +474,11 @@ public: } adl_alloc_destroy_n; constexpr class adl_alloc_uninitialized_copy_fn__ { - template constexpr auto _(priority<1>, T&& t, As&&... as) const DECLRETURN( xtd::alloc_uninitialized_copy(std::forward(t), std::forward(as)...)) - template constexpr auto _(priority<2>, T&& t, As&&... as) const DECLRETURN( alloc_uninitialized_copy(std::forward(t), std::forward(as)...)) - template constexpr auto _(priority<3>, T&& t, As&&... as) const DECLRETURN( std::decay_t::alloc_uninitialized_copy(std::forward(t), std::forward(as)...)) - template constexpr auto _(priority<4>, T&& t, As&&... as) const DECLRETURN(std::forward(t).alloc_uninitialized_copy(std::forward(as)...)) + template constexpr auto _(priority<1>, A&& , As&&... as) const DECLRETURN( adl_uninitialized_copy(std::forward(as)...)) + template constexpr auto _(priority<2>, T&& t, As&&... as) const DECLRETURN( xtd::alloc_uninitialized_copy(std::forward(t), std::forward(as)...)) + template constexpr auto _(priority<3>, T&& t, As&&... as) const DECLRETURN( alloc_uninitialized_copy(std::forward(t), std::forward(as)...)) + template constexpr auto _(priority<4>, T&& t, As&&... as) const DECLRETURN( std::decay_t::alloc_uninitialized_copy(std::forward(t), std::forward(as)...)) + template constexpr auto _(priority<5>, T&& t, As&&... as) const DECLRETURN(std::forward(t).alloc_uninitialized_copy(std::forward(as)...)) public: template constexpr auto operator()(As&&... as) const DECLRETURN(_(priority<5>{}, std::forward(as)...)) } adl_alloc_uninitialized_copy;