summaryrefslogtreecommitdiffstats
path: root/test/std/containers/unord/unord.multimap
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-06-26 20:21:22 +0000
committerEric Fiselier <eric@efcs.ca>2016-06-26 20:21:22 +0000
commit5078baa9e0475783a366e54da37cc9e58f386325 (patch)
tree10a39453b98638f2c97294dd08799ce324b2bc8a /test/std/containers/unord/unord.multimap
parent47920eb75e641ec5382c3c3d1419be3c7b464b14 (diff)
downloadexternal_libcxx-5078baa9e0475783a366e54da37cc9e58f386325.tar.gz
external_libcxx-5078baa9e0475783a366e54da37cc9e58f386325.tar.bz2
external_libcxx-5078baa9e0475783a366e54da37cc9e58f386325.zip
Make default_noexcept.pass.cpp container tests more portable. Patch from STL@microsoft.com
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@273823 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/std/containers/unord/unord.multimap')
-rw-r--r--test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
index 587e3ad1f..e404612a7 100644
--- a/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
+++ b/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/default_noexcept.pass.cpp
@@ -22,6 +22,7 @@
#include <unordered_map>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
#include "test_allocator.h"
#include "../../../test_hash.h"
@@ -47,12 +48,12 @@ int main()
{
{
typedef std::unordered_multimap<MoveOnly, MoveOnly> C;
- static_assert(std::is_nothrow_default_constructible<C>::value, "");
+ LIBCPP_STATIC_ASSERT(std::is_nothrow_default_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_default_constructible<C>::value, "");
+ LIBCPP_STATIC_ASSERT(std::is_nothrow_default_constructible<C>::value, "");
}
{
typedef std::unordered_multimap<MoveOnly, MoveOnly, std::hash<MoveOnly>,