re PR libstdc++/56834 (Errors in <array> with --enable-symvers=gnu-versioned-namespac...

2013-04-03  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/56834
	* include/debug/array (tuple_size, tuple_element): Do not declare.
	* include/profile/array: Likewise.
	* testsuite/23_containers/array/tuple_interface/
	tuple_element_debug_neg.cc: Adjust dg-error line number.

From-SVN: r197415

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9e27c7632c605d9a57ff0fc50b640540ace04c4c..6522c25999ea31a21a587b6b4afae66b61a9ab5a 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2013-04-03  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       PR libstdc++/56834
+       * include/debug/array (tuple_size, tuple_element): Do not declare.
+       * include/profile/array: Likewise.
+       * testsuite/23_containers/array/tuple_interface/
+       tuple_element_debug_neg.cc: Adjust dg-error line number.
+
 2013-04-03  Jonathan Wakely  <jwakely.gcc@gmail.com>
 
        * libsupc++/exception (get_terminate(), get_unexpected()): Declare.

diff --git a/libstdc++-v3/include/debug/array b/libstdc++-v3/include/debug/array
index 734eeaded72619be629cf158f2ded700a9bfe2da..bce10cf3f1207fc918075887801c99694a0216a5 100644 (file)
--- a/libstdc++-v3/include/debug/array
+++ b/libstdc++-v3/include/debug/array
@@ -289,17 +289,11 @@ namespace __debug
   // Tuple interface to class template array.
 
   /// tuple_size
-  template<typename _Tp> 
-    class tuple_size;
-
   template<typename _Tp, std::size_t _Nm>
     struct tuple_size<__debug::array<_Tp, _Nm>>
     : public integral_constant<std::size_t, _Nm> { };
 
   /// tuple_element
-  template<std::size_t _Int, typename _Tp>
-    class tuple_element;
-
   template<std::size_t _Int, typename _Tp, std::size_t _Nm>
     struct tuple_element<_Int, __debug::array<_Tp, _Nm>>
     {

diff --git a/libstdc++-v3/include/profile/array b/libstdc++-v3/include/profile/array
index 4313fd2d5a37eb3c2536a2b5caf99746dae3935f..bd6da6ca3960d0eecd70526ae6d16b8a60d4fa37 100644 (file)
--- a/libstdc++-v3/include/profile/array
+++ b/libstdc++-v3/include/profile/array
@@ -251,17 +251,11 @@ namespace __profile
   // Tuple interface to class template array.
 
   /// tuple_size
-  template<typename _Tp> 
-    class tuple_size;
-
   template<typename _Tp, std::size_t _Nm>
     struct tuple_size<__profile::array<_Tp, _Nm>>
     : public integral_constant<std::size_t, _Nm> { };
 
   /// tuple_element
-  template<std::size_t _Int, typename _Tp>
-    class tuple_element;
-
   template<std::size_t _Int, typename _Tp, std::size_t _Nm>
     struct tuple_element<_Int, __profile::array<_Tp, _Nm>>
     {

diff --git a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc
index 3e5ec1edb22427102f9aec21bb30166436ed918d..76ea230b14e8f91af2f243acbcd81bae5babb7ba 100644 (file)
--- a/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc
+++ b/libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc
@@ -23,4 +23,4 @@
 
 typedef std::tuple_element<1, std::array<int, 1>>::type type;
 
-// { dg-error "static assertion failed" "" { target *-*-* } 306 }
+// { dg-error "static assertion failed" "" { target *-*-* } 300 }