diff options
author | Dan Albert <danalbert@google.com> | 2017-03-20 18:45:32 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-20 18:45:32 +0000 |
commit | ed31f4b9be19ad4eaff38d16fe13a5f8e8da2c45 (patch) | |
tree | 98be0728c8a7e96003719c4145662f487a663d81 /test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp | |
parent | fe2f63c01a68844ea7976716ef1b610145ab9dda (diff) | |
parent | fabe890b7506b61a1b865c3bbf235674b2188197 (diff) | |
download | external_libcxx-ed31f4b9be19ad4eaff38d16fe13a5f8e8da2c45.tar.gz external_libcxx-ed31f4b9be19ad4eaff38d16fe13a5f8e8da2c45.tar.bz2 external_libcxx-ed31f4b9be19ad4eaff38d16fe13a5f8e8da2c45.zip |
Merge to upstream r297772. am: b9e7f084bd
am: fabe890b75
Change-Id: I84b59f55a5e26cda1cb10d992f7ed0093c97df71
Diffstat (limited to 'test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp')
-rw-r--r-- | test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp index c221b6f2e..4afef42e6 100644 --- a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp @@ -125,16 +125,18 @@ int main() typedef std::unordered_multiset<MoveOnly> C; static_assert(noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); } +#if defined(_LIBCPP_VERSION) { typedef std::unordered_multiset<MoveOnly, std::hash<MoveOnly>, std::equal_to<MoveOnly>, test_allocator<MoveOnly>> C; - LIBCPP_STATIC_ASSERT(noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); + static_assert(noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); } { typedef std::unordered_multiset<MoveOnly, std::hash<MoveOnly>, std::equal_to<MoveOnly>, other_allocator<MoveOnly>> C; - LIBCPP_STATIC_ASSERT(noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); + static_assert(noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); } +#endif // _LIBCPP_VERSION { typedef std::unordered_multiset<MoveOnly, some_hash<MoveOnly>> C; static_assert(!noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); @@ -178,10 +180,11 @@ int main() typedef std::unordered_multiset<MoveOnly, some_hash2<MoveOnly>, some_comp2<MoveOnly>, some_alloc2<MoveOnly>> C; static_assert( noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); } - +#if defined(_LIBCPP_VERSION) { // NOT always equal allocator, nothrow swap for hash, nothrow swap for comp typedef std::unordered_multiset<MoveOnly, some_hash2<MoveOnly>, some_comp2<MoveOnly>, some_alloc3<MoveOnly>> C; - LIBCPP_STATIC_ASSERT( noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); + static_assert( noexcept(swap(std::declval<C&>(), std::declval<C&>())), ""); } +#endif // _LIBCPP_VERSION #endif } |