diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
| -rw-r--r-- | libstdc++-v3/include/debug/array | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/profile/array | 6 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/23_containers/array/tuple_interface/tuple_element_debug_neg.cc | 2 |
4 files changed, 9 insertions, 13 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 9e27c76..6522c25 100644 --- 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 734eead..bce10cf 100644 --- 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 4313fd2..bd6da6c 100644 --- 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 3e5ec1e..76ea230 100644 --- 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 } |