diff options
author | Eric Fiselier <eric@efcs.ca> | 2016-07-24 23:19:51 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2016-07-24 23:19:51 +0000 |
commit | a29e0e5ba2ad9a130fc712591da374e80cc7153e (patch) | |
tree | 72374d181b4e458c9a058bc515092aff79693a23 /test/std/containers/unord/unord.multimap/unord.multimap.cnstr | |
parent | 7ee04dd6f27c786e20cbb13912f893d0e00854f1 (diff) | |
download | external_libcxx-a29e0e5ba2ad9a130fc712591da374e80cc7153e.tar.gz external_libcxx-a29e0e5ba2ad9a130fc712591da374e80cc7153e.tar.bz2 external_libcxx-a29e0e5ba2ad9a130fc712591da374e80cc7153e.zip |
Make move_noexcept.pass.cpp tests more portable. Patch from STL@microsoft.com
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@276581 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/std/containers/unord/unord.multimap/unord.multimap.cnstr')
-rw-r--r-- | test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp index 965c46499..94067c316 100644 --- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp +++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/move_noexcept.pass.cpp @@ -20,6 +20,7 @@ #include <unordered_map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -43,17 +44,17 @@ int main() { { typedef std::unordered_multimap<MoveOnly, MoveOnly> C; - static_assert(std::is_nothrow_move_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_move_constructible<C>::value, ""); } { typedef std::unordered_multimap<MoveOnly, MoveOnly, std::hash<MoveOnly>, std::equal_to<MoveOnly>, test_allocator<std::pair<const MoveOnly, MoveOnly>>> C; - static_assert(std::is_nothrow_move_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_move_constructible<C>::value, ""); } { typedef std::unordered_multimap<MoveOnly, MoveOnly, std::hash<MoveOnly>, std::equal_to<MoveOnly>, other_allocator<std::pair<const MoveOnly, MoveOnly>>> C; - static_assert(std::is_nothrow_move_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_move_constructible<C>::value, ""); } { typedef std::unordered_multimap<MoveOnly, MoveOnly, some_hash<MoveOnly>> C; |