From ed50d14e9ecfcae95e0d3787825cb3628557522d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= <igaztanaga@gmail.com>
Date: Mon, 14 May 2018 11:49:35 +0200
Subject: [PATCH] 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

---
 include/boost/container/detail/variadic_templates_tools.hpp | 2 +-
 test/pair_test.cpp                                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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<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>
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_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);