aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4>2018-05-21 19:48:52 +0000
committerfdumont <fdumont@138bc75d-0d04-0410-961f-82ee72b054a4>2018-05-21 19:48:52 +0000
commit38d25ca8a5e5b5a9067bf12e3e89e6912b39ca62 (patch)
treee108bc6acea84be30d38718ba374fd723911e51c
parent41795d9d5c4427d9e7e8e3f677a4e75a2ab8e704 (diff)
2018-05-21 François Dumont <fdumont@gcc.gnu.org>
* include/debug/map.h (map(map&&, const_allocator_type&)): Add noexcept qualitication. * include/debug/multimap.h (multimap(multimap&&, const_allocator_type&)): Likewise. * include/debug/set.h (set(set&&, const_allocator_type&)): Likewise. * include/debug/multiset.h (multiset(multiset&&, const_allocator_type&)): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@260483 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libstdc++-v3/ChangeLog11
-rw-r--r--libstdc++-v3/include/debug/map.h1
-rw-r--r--libstdc++-v3/include/debug/multimap.h1
-rw-r--r--libstdc++-v3/include/debug/multiset.h1
-rw-r--r--libstdc++-v3/include/debug/set.h1
5 files changed, 15 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 17869460d0f..f579439945d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,14 @@
+2018-05-21 François Dumont <fdumont@gcc.gnu.org>
+
+ * include/debug/map.h
+ (map(map&&, const_allocator_type&)): Add noexcept qualitication.
+ * include/debug/multimap.h
+ (multimap(multimap&&, const_allocator_type&)): Likewise.
+ * include/debug/set.h
+ (set(set&&, const_allocator_type&)): Likewise.
+ * include/debug/multiset.h
+ (multiset(multiset&&, const_allocator_type&)): Likewise.
+
2018-05-21 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/85818
diff --git a/libstdc++-v3/include/debug/map.h b/libstdc++-v3/include/debug/map.h
index 414b4dc0752..7a4e2bff015 100644
--- a/libstdc++-v3/include/debug/map.h
+++ b/libstdc++-v3/include/debug/map.h
@@ -105,6 +105,7 @@ namespace __debug
: _Base(__m, __a) { }
map(map&& __m, const allocator_type& __a)
+ noexcept( noexcept(_Base(std::move(__m._M_base()), __a)) )
: _Safe(std::move(__m._M_safe()), __a),
_Base(std::move(__m._M_base()), __a) { }
diff --git a/libstdc++-v3/include/debug/multimap.h b/libstdc++-v3/include/debug/multimap.h
index 8d6358b3030..9ee3809a579 100644
--- a/libstdc++-v3/include/debug/multimap.h
+++ b/libstdc++-v3/include/debug/multimap.h
@@ -105,6 +105,7 @@ namespace __debug
: _Base(__m, __a) { }
multimap(multimap&& __m, const allocator_type& __a)
+ noexcept( noexcept(_Base(std::move(__m._M_base()), __a)) )
: _Safe(std::move(__m._M_safe()), __a),
_Base(std::move(__m._M_base()), __a) { }
diff --git a/libstdc++-v3/include/debug/multiset.h b/libstdc++-v3/include/debug/multiset.h
index 4e1406e93c2..0be14d7fc28 100644
--- a/libstdc++-v3/include/debug/multiset.h
+++ b/libstdc++-v3/include/debug/multiset.h
@@ -104,6 +104,7 @@ namespace __debug
: _Base(__m, __a) { }
multiset(multiset&& __m, const allocator_type& __a)
+ noexcept( noexcept(_Base(std::move(__m._M_base()), __a)) )
: _Safe(std::move(__m._M_safe()), __a),
_Base(std::move(__m._M_base()), __a) { }
diff --git a/libstdc++-v3/include/debug/set.h b/libstdc++-v3/include/debug/set.h
index a886860ceab..7f24a83237e 100644
--- a/libstdc++-v3/include/debug/set.h
+++ b/libstdc++-v3/include/debug/set.h
@@ -104,6 +104,7 @@ namespace __debug
: _Base(__x, __a) { }
set(set&& __x, const allocator_type& __a)
+ noexcept( noexcept(_Base(std::move(__x._M_base()), __a)) )
: _Safe(std::move(__x._M_safe()), __a),
_Base(std::move(__x._M_base()), __a) { }