Change forward_as_tuple to forward_as_tuple_impl as there are ambiguities when std headers are included. It's is used only in the pair test

This commit is contained in:
Ion Gaztañaga
2018-05-14 11:49:35 +02:00
parent cfe9b200d0
commit ed50d14e9e
2 changed files with 3 additions and 3 deletions

View File

@@ -78,7 +78,7 @@ class tuple<Head, Tail...>
template<typename... Values>
tuple<Values&&...> forward_as_tuple(Values&&... values)
tuple<Values&&...> forward_as_tuple_impl(Values&&... values)
{ return tuple<Values&&...>(::boost::forward<Values>(values)...); }
template<int I, typename Tuple>

View File

@@ -140,8 +140,8 @@ int main ()
typedef dtl::pair<movable_pair_t, movable_pair_t> 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);