From 4b74f2b44da5f78d2621f5b7f1c6d774d6d498ac Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Thu, 22 Mar 2012 12:33:17 +0000 Subject: [PATCH] array (array<>::at(size_type) const): Fix version for undefined __EXCEPTIONS. 2012-03-22 Paolo Carlini * include/std/array (array<>::at(size_type) const): Fix version for undefined __EXCEPTIONS. From-SVN: r185689 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/std/array | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 6eb24d8f9f6..a618d2a7499 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2012-03-22 Paolo Carlini + + * include/std/array (array<>::at(size_type) const): Fix version + for undefined __EXCEPTIONS. + 2013-03-21 Andreas Tobler * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: diff --git a/libstdc++-v3/include/std/array b/libstdc++-v3/include/std/array index ae7445d0b21..3e177444083 100644 --- a/libstdc++-v3/include/std/array +++ b/libstdc++-v3/include/std/array @@ -174,8 +174,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION const_reference at(size_type __n) const { - return __n < _Nm ? - _M_instance[__n] : __throw_out_of_range(__N("array::at")); + if (__n >= _Nm) + std::__throw_out_of_range(__N("array::at")); + return _M_instance[__n]; } #endif