diff options
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 7 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc | 41 |
2 files changed, 26 insertions, 22 deletions
diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 6953f87..8ee0d2f 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -1406,6 +1406,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return std::forward<const __element_type>(std::__get_helper<__i>(__t)); } + /// @cond undocumented + // Deleted overload chosen for invalid indices. + template<size_t __i, typename... _Elements> + constexpr __enable_if_t<(__i >= sizeof...(_Elements))> + get(const tuple<_Elements...>&) = delete; + /// @endcond + #if __cplusplus >= 201402L #define __cpp_lib_tuples_by_type 201304 diff --git a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc index cd850fd..225bb62 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/element_access/get_neg.cc @@ -25,12 +25,12 @@ test01() { using test_type = std::tuple<>; test_type t; - std::get<0>(t); // { dg-error "no match" } - std::get<0>(const_cast<const test_type&>(t)); // { dg-error "no match" } - std::get<0>(static_cast<test_type&&>(t)); // { dg-error "no match" } - std::get<5>(t); // { dg-error "no match" } - std::get<5>(const_cast<const test_type&>(t)); // { dg-error "no match" } - std::get<5>(static_cast<test_type&&>(t)); // { dg-error "no match" } + std::get<0>(t); // { dg-error "deleted" } + std::get<0>(const_cast<const test_type&>(t)); // { dg-error "deleted" } + std::get<0>(static_cast<test_type&&>(t)); // { dg-error "deleted" } + std::get<5>(t); // { dg-error "deleted" } + std::get<5>(const_cast<const test_type&>(t)); // { dg-error "deleted" } + std::get<5>(static_cast<test_type&&>(t)); // { dg-error "deleted" } } void @@ -38,12 +38,12 @@ test02() { using test_type = std::tuple<int>; test_type t; - std::get<1>(t); // { dg-error "no match" } - std::get<1>(const_cast<const test_type&>(t)); // { dg-error "no match" } - std::get<1>(static_cast<test_type&&>(t)); // { dg-error "no match" } - std::get<5>(t); // { dg-error "no match" } - std::get<5>(const_cast<const test_type&>(t)); // { dg-error "no match" } - std::get<5>(static_cast<test_type&&>(t)); // { dg-error "no match" } + std::get<1>(t); // { dg-error "deleted" } + std::get<1>(const_cast<const test_type&>(t)); // { dg-error "deleted" } + std::get<1>(static_cast<test_type&&>(t)); // { dg-error "deleted" } + std::get<5>(t); // { dg-error "deleted" } + std::get<5>(const_cast<const test_type&>(t)); // { dg-error "deleted" } + std::get<5>(static_cast<test_type&&>(t)); // { dg-error "deleted" } } void @@ -51,15 +51,12 @@ test03() { using test_type = std::tuple<int, int, int, int>; test_type t; - std::get<5>(t); // { dg-error "no match" } - std::get<5>(const_cast<const test_type&>(t)); // { dg-error "no match" } - std::get<5>(static_cast<test_type&&>(t)); // { dg-error "no match" } - std::get<6>(t); // { dg-error "no match" } - std::get<6>(const_cast<const test_type&>(t)); // { dg-error "no match" } - std::get<6>(static_cast<test_type&&>(t)); // { dg-error "no match" } + std::get<5>(t); // { dg-error "deleted" } + std::get<5>(const_cast<const test_type&>(t)); // { dg-error "deleted" } + std::get<5>(static_cast<test_type&&>(t)); // { dg-error "deleted" } + std::get<6>(t); // { dg-error "deleted" } + std::get<6>(const_cast<const test_type&>(t)); // { dg-error "deleted" } + std::get<6>(static_cast<test_type&&>(t)); // { dg-error "deleted" } } -// { dg-prune-output "tuple index must be in range" } -// { dg-prune-output "no type named .type" } -// { dg-prune-output "type/value mismatch" } -// { dg-prune-output "use of deleted function" } +// { dg-error "tuple index must be in range" "" { target *-*-* } 0 } |