From ff68363e16177b23e9af5451898c43ea321266d5 Mon Sep 17 00:00:00 2001 From: redi Date: Sat, 8 Jun 2013 17:31:40 +0000 Subject: [PATCH] * include/bits/alloc_traits.h (allocator_traits::max_size()): LWG 2162: Add noexcept. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199858 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/alloc_traits.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 55037c12db90..c48f2fc1a6e4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2013-06-08 Jonathan Wakely + + * include/bits/alloc_traits.h (allocator_traits::max_size()): LWG + 2162: Add noexcept. + 2013-06-08 Jonathan Wakely * include/bits/stl_algo.h (is_permutation): Add overloads from N3671. diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h index 33ea145d521d..e68d31710951 100644 --- a/libstdc++-v3/include/bits/alloc_traits.h +++ b/libstdc++-v3/include/bits/alloc_traits.h @@ -412,7 +412,7 @@ _GLIBCXX_ALLOC_TR_NESTED_TYPE(propagate_on_container_swap, * Returns @c __a.max_size() if that expression is well-formed, * otherwise returns @c numeric_limits::max() */ - static size_type max_size(const _Alloc& __a) + static size_type max_size(const _Alloc& __a) noexcept { return _S_max_size(__a); } /** -- 2.47.2