From 6c6705a90426f383208a482263812cfe2894fa74 Mon Sep 17 00:00:00 2001
From: Jonathan Wakely <jwakely@redhat.com>
Date: Fri, 27 Oct 2017 18:49:36 +0100
Subject: [PATCH] Simplify _Node_insert_return to avoid including <tuple>

	* include/bits/node_handle.h (_Node_insert_return::get): Avoid
	use of std::tie and std::get.

From-SVN: r254162
---
 libstdc++-v3/ChangeLog                  |  3 ++
 libstdc++-v3/include/bits/node_handle.h | 37 +++++++++++++++++++++----
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 36689900be1..796e32c1ba3 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,8 @@
 2017-10-27  Jonathan Wakely  <jwakely@redhat.com>
 
+	* include/bits/node_handle.h (_Node_insert_return::get): Avoid
+	use of std::tie and std::get.
+
 	* include/Makefile.am: Put headers in alphabetical order.
 	* include/Makefile.in: Regenerate.
 
diff --git a/libstdc++-v3/include/bits/node_handle.h b/libstdc++-v3/include/bits/node_handle.h
index c7694a1e0ef..f93bfd7f686 100644
--- a/libstdc++-v3/include/bits/node_handle.h
+++ b/libstdc++-v3/include/bits/node_handle.h
@@ -37,7 +37,6 @@
 # define __cpp_lib_node_extract 201606
 
 #include <optional>
-#include <tuple>
 #include <bits/alloc_traits.h>
 #include <bits/ptr_traits.h>
 
@@ -286,22 +285,50 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       template<size_t _Idx>
 	decltype(auto) get() &
-	{ return std::get<_Idx>(std::tie(inserted, position, node)); }
+	{
+	  static_assert(_Idx < 3);
+	  if constexpr (_Idx == 0)
+	    return inserted;
+	  else if constexpr (_Idx == 1)
+	    return position;
+	  else if constexpr (_Idx == 2)
+	    return node;
+	}
 
       template<size_t _Idx>
 	decltype(auto) get() const &
-	{ return std::get<_Idx>(std::tie(inserted, position, node)); }
+	{
+	  static_assert(_Idx < 3);
+	  if constexpr (_Idx == 0)
+	    return inserted;
+	  else if constexpr (_Idx == 1)
+	    return position;
+	  else if constexpr (_Idx == 2)
+	    return node;
+	}
 
       template<size_t _Idx>
 	decltype(auto) get() &&
 	{
-	  return std::move(std::get<_Idx>(std::tie(inserted, position, node)));
+	  static_assert(_Idx < 3);
+	  if constexpr (_Idx == 0)
+	    return std::move(inserted);
+	  else if constexpr (_Idx == 1)
+	    return std::move(position);
+	  else if constexpr (_Idx == 2)
+	    return std::move(node);
 	}
 
       template<size_t _Idx>
 	decltype(auto) get() const &&
 	{
-	  return std::move(std::get<_Idx>(std::tie(inserted, position, node)));
+	  static_assert(_Idx < 3);
+	  if constexpr (_Idx == 0)
+	    return std::move(inserted);
+	  else if constexpr (_Idx == 1)
+	    return std::move(position);
+	  else if constexpr (_Idx == 2)
+	    return std::move(node);
 	}
     };
 
-- 
2.30.2