re PR libstdc++/60497 (unique_ptr<T> tries to complete its type T even though it...

	PR libstdc++/60497
	* include/std/tuple (get): Qualify calls to prevent ADL.
	* testsuite/20_util/tuple/60497.cc: New.

From-SVN: r209381

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index cd5e5e6aa0c538a8fa0bdde61b7de9df7f28ba93..ef35927cc25421763a2473256c7f9e8f049ea53e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -9,6 +9,10 @@
        * include/bits/allocator.h (operator==, operator!=): Add exception
        specifications.
 
+       PR libstdc++/60497
+       * include/std/tuple (get): Qualify calls to prevent ADL.
+       * testsuite/20_util/tuple/60497.cc: New.
+
 2014-04-11  Marc Glisse  <marc.glisse@inria.fr>
 
        PR libstdc++/59434

diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple
index 92ecdb9bc5bd610fe3dc543c9be7a173ca0dbda9..47a10ec75fcca08a2187f33405ca0d7745a2bc2b 100644 (file)
--- a/libstdc++-v3/include/std/tuple
+++ b/libstdc++-v3/include/std/tuple
@@ -755,14 +755,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
                       typename tuple_element<__i, tuple<_Elements...>>::type
                     >::type
     get(tuple<_Elements...>& __t) noexcept
-    { return __get_helper<__i>(__t); }
+    { return std::__get_helper<__i>(__t); }
 
   template<std::size_t __i, typename... _Elements>
     constexpr typename __add_c_ref<
                       typename tuple_element<__i, tuple<_Elements...>>::type
                     >::type
     get(const tuple<_Elements...>& __t) noexcept
-    { return __get_helper<__i>(__t); }
+    { return std::__get_helper<__i>(__t); }
 
   template<std::size_t __i, typename... _Elements>
     constexpr typename __add_r_ref<
@@ -786,17 +786,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
   template <typename _Tp, typename... _Types>
     constexpr _Tp&
     get(tuple<_Types...>& __t) noexcept
-    { return __get_helper2<_Tp>(__t); }
+    { return std::__get_helper2<_Tp>(__t); }
 
   template <typename _Tp, typename... _Types>
     constexpr _Tp&&
     get(tuple<_Types...>&& __t) noexcept
-    { return std::move(__get_helper2<_Tp>(__t)); }
+    { return std::move(std::__get_helper2<_Tp>(__t)); }
 
   template <typename _Tp, typename... _Types>
     constexpr const _Tp&
     get(const tuple<_Types...>& __t) noexcept
-    { return __get_helper2<_Tp>(__t); }
+    { return std::__get_helper2<_Tp>(__t); }
 #endif
 
   // This class helps construct the various comparison operations on tuples

diff --git a/libstdc++-v3/testsuite/20_util/tuple/60497.cc b/libstdc++-v3/testsuite/20_util/tuple/60497.cc
new file mode 100644 (file)
index 0000000..76d4223
--- /dev/null
+++ b/libstdc++-v3/testsuite/20_util/tuple/60497.cc
@@ -0,0 +1,37 @@
+// { dg-options "-std=gnu++14" }
+// { dg-do compile }
+
+// Copyright (C) 2014 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// libstdc++/60497
+
+#include <tuple>
+
+struct A;
+template<typename T> struct B { T t; };
+
+using element_type = B<A>*;
+using tuple_type = std::tuple<element_type>;
+
+tuple_type t;
+const tuple_type ct;
+
+auto a = std::get<0>(t);
+auto b = std::get<0>(ct);
+auto c = std::get<element_type>(t);
+auto d = std::get<element_type>(ct);