aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2014-04-14 16:13:02 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2014-04-14 16:13:02 +0100
commite364673d87f7409f9014d25989293f6a80c9508c (patch)
treef4d8b5024d12778377ff669d0ff9849a23342d29
parent5b99e0a022d972be4c1a1978255b8de56d4ae59a (diff)
downloadgcc-e364673d87f7409f9014d25989293f6a80c9508c.zip
gcc-e364673d87f7409f9014d25989293f6a80c9508c.tar.gz
gcc-e364673d87f7409f9014d25989293f6a80c9508c.tar.bz2
allocator.h (operator==, operator!=): Add exception specifications.
* include/bits/allocator.h (operator==, operator!=): Add exception specifications. From-SVN: r209379
-rw-r--r--libstdc++-v3/ChangeLog3
-rw-r--r--libstdc++-v3/include/bits/allocator.h4
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a2ea772..cd5e5e6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -6,6 +6,9 @@
* include/bits/vector.tcc (vector::_M_insert_aux,
vector::_M_explace_back_aux): Likewise for assignment.
+ * include/bits/allocator.h (operator==, operator!=): Add exception
+ specifications.
+
2014-04-11 Marc Glisse <marc.glisse@inria.fr>
PR libstdc++/59434
diff --git a/libstdc++-v3/include/bits/allocator.h b/libstdc++-v3/include/bits/allocator.h
index e293c54..05a06ba 100644
--- a/libstdc++-v3/include/bits/allocator.h
+++ b/libstdc++-v3/include/bits/allocator.h
@@ -126,21 +126,25 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _T1, typename _T2>
inline bool
operator==(const allocator<_T1>&, const allocator<_T2>&)
+ _GLIBCXX_USE_NOEXCEPT
{ return true; }
template<typename _Tp>
inline bool
operator==(const allocator<_Tp>&, const allocator<_Tp>&)
+ _GLIBCXX_USE_NOEXCEPT
{ return true; }
template<typename _T1, typename _T2>
inline bool
operator!=(const allocator<_T1>&, const allocator<_T2>&)
+ _GLIBCXX_USE_NOEXCEPT
{ return false; }
template<typename _Tp>
inline bool
operator!=(const allocator<_Tp>&, const allocator<_Tp>&)
+ _GLIBCXX_USE_NOEXCEPT
{ return false; }
/// @} group allocator