From: Jonathan Wakely <jwakely.gcc@gmail.com>
Date: Sat, 8 Jun 2013 17:31:40 +0000 (+0000)
Subject: alloc_traits.h (allocator_traits::max_size()): LWG 2162: Add noexcept.
X-Git-Tag: releases/gcc-4.9.0~5482
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7b91690215d275028eacf31f75a22aaa9bc4f3b2;p=thirdparty%2Fgcc.git

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
---

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  <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.
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<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); }
 
       /**