summaryrefslogtreecommitdiff
path: root/libstdc++-v3/include/ext
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2015-06-17 10:51:46 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2015-06-17 10:51:46 +0000
commitf3c08b92531f2e6a4c8d769fb1096a84cca8de16 (patch)
tree86fff65492d3c28c85951f5ea1cb5f92dc475153 /libstdc++-v3/include/ext
parentb8b0c0292cbcf68702895298c38e1181418a3a50 (diff)
downloadgcc-f3c08b92531f2e6a4c8d769fb1096a84cca8de16.tar.gz
* include/ext/alloc_traits.h (__alloc_traits::_S_nothrow_swap()): Use
__is_nothrow_swappable. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224552 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/ext')
-rw-r--r--libstdc++-v3/include/ext/alloc_traits.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/libstdc++-v3/include/ext/alloc_traits.h b/libstdc++-v3/include/ext/alloc_traits.h
index 06bc70a4cb2..bd0f75945aa 100644
--- a/libstdc++-v3/include/ext/alloc_traits.h
+++ b/libstdc++-v3/include/ext/alloc_traits.h
@@ -159,9 +159,8 @@ template<typename _Alloc>
static constexpr bool _S_nothrow_swap()
{
- using std::swap;
return !_S_propagate_on_swap()
- || noexcept(swap(std::declval<_Alloc&>(), std::declval<_Alloc&>()));
+ || std::__is_nothrow_swappable<_Alloc>::value;
}
template<typename _Tp>