From 885e812159dcbf83f790eee9d839f91daa553eb3 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sun, 9 Sep 2012 17:56:51 +0000 Subject: re PR libstdc++/54388 (std::array.at() const results in undefined behaviour) PR libstdc++/54388 * include/std/array (array::at() const): Ensure lvalue result. * testsuite/23_containers/array/element_access/54388.cc: New. * testsuite/23_containers/array/tuple_interface/get_neg.cc: Adjust dg-error line numbers. * testsuite/23_containers/array/tuple_interface/tuple_element_neg.cc: Likewise. From-SVN: r191114 --- libstdc++-v3/include/std/array | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'libstdc++-v3/include/std/array') diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index 58263ce..4ee2199 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -164,22 +164,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return _M_instance[__n]; } -#ifdef __EXCEPTIONS constexpr const_reference at(size_type __n) const { - return __n < _Nm ? - _M_instance[__n] : throw out_of_range(__N("array::at")); + // Result of conditional expression must be an lvalue so use + // boolean ? lvalue : (throw-expr, lvalue) + return __n < _Nm ? _M_instance[__n] + : (std::__throw_out_of_range(__N("array::at")), _M_instance[0]); } -#else - const_reference - at(size_type __n) const - { - if (__n >= _Nm) - std::__throw_out_of_range(__N("array::at")); - return _M_instance[__n]; - } -#endif reference front() -- cgit v1.1