aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2013-06-08 17:31:40 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2013-06-08 18:31:40 +0100
commit7b91690215d275028eacf31f75a22aaa9bc4f3b2 (patch)
treedbc8cf8ac3490b49d88e8fe35e7255583557b0ef
parent776434d183b632291cac1d89b025ab7565c623c6 (diff)
downloadgcc-7b91690215d275028eacf31f75a22aaa9bc4f3b2.zip
gcc-7b91690215d275028eacf31f75a22aaa9bc4f3b2.tar.gz
gcc-7b91690215d275028eacf31f75a22aaa9bc4f3b2.tar.bz2
alloc_traits.h (allocator_traits::max_size()): LWG 2162: Add noexcept.
* include/bits/alloc_traits.h (allocator_traits::max_size()): LWG 2162: Add noexcept. From-SVN: r199858
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/alloc_traits.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 55037c1..c48f2fc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
2013-06-08 Jonathan Wakely <jwakely.gcc@gmail.com>
+ * include/bits/alloc_traits.h (allocator_traits::max_size()): LWG
+ 2162: Add noexcept.
+
+2013-06-08 Jonathan Wakely <jwakely.gcc@gmail.com>
+
* include/bits/stl_algo.h (is_permutation): Add overloads from N3671.
* include/bits/stl_algobase.h (equal, mismatch): Likewise.
* testsuite/25_algorithms/equal/1.cc: Remove duplicate test case.
diff --git a/libstdc++-v3/include/bits/alloc_traits.h b/libstdc++-v3/include/bits/alloc_traits.h
index 33ea145..e68d317 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<size_type>::max()
*/
- static size_type max_size(const _Alloc& __a)
+ static size_type max_size(const _Alloc& __a) noexcept
{ return _S_max_size(__a); }
/**