diff --git a/include/boost/container/detail/variadic_templates_tools.hpp b/include/boost/container/detail/variadic_templates_tools.hpp index 1e6f3df..4f16fb0 100644 --- a/include/boost/container/detail/variadic_templates_tools.hpp +++ b/include/boost/container/detail/variadic_templates_tools.hpp @@ -78,7 +78,7 @@ class tuple template -tuple forward_as_tuple(Values&&... values) +tuple forward_as_tuple_impl(Values&&... values) { return tuple(::boost::forward(values)...); } template diff --git a/test/pair_test.cpp b/test/pair_test.cpp index fcab0fb..5ead7a4 100644 --- a/test/pair_test.cpp +++ b/test/pair_test.cpp @@ -140,8 +140,8 @@ int main () typedef dtl::pair movable_pair_pair_t; test::movable_int a(1), b(2), c(3), d(4); movable_pair_pair_t p( piecewise_construct - , dtl::forward_as_tuple(boost::move(a), boost::move(b)) - , dtl::forward_as_tuple(boost::move(c), boost::move(d)) + , dtl::forward_as_tuple_impl(boost::move(a), boost::move(b)) + , dtl::forward_as_tuple_impl(boost::move(c), boost::move(d)) ); BOOST_TEST(p.first.first == 1); BOOST_TEST(p.first.second == 2);