diff options
author | Eric Fiselier <eric@efcs.ca> | 2016-06-26 20:21:22 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2016-06-26 20:21:22 +0000 |
commit | a9fb19d3a5337428a0b1cd6d15818b2395e8caf8 (patch) | |
tree | 419ee091fd7c84bbe3d2f69d4d563aaa14ac817b /libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp | |
parent | 7cca38bfd1a4192034d77e30a4d80a57e508a526 (diff) | |
download | bcm5719-llvm-a9fb19d3a5337428a0b1cd6d15818b2395e8caf8.tar.gz bcm5719-llvm-a9fb19d3a5337428a0b1cd6d15818b2395e8caf8.zip |
Make default_noexcept.pass.cpp container tests more portable. Patch from STL@microsoft.com
llvm-svn: 273823
Diffstat (limited to 'libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp')
-rw-r--r-- | libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp index 44cca7f071b..817f1207ac9 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/default_noexcept.pass.cpp @@ -22,6 +22,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "test_allocator.h" @@ -38,11 +39,11 @@ int main() typedef std::pair<const MoveOnly, MoveOnly> V; { typedef std::map<MoveOnly, MoveOnly> C; - static_assert(std::is_nothrow_default_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_default_constructible<C>::value, ""); } { typedef std::map<MoveOnly, MoveOnly, std::less<MoveOnly>, test_allocator<V>> C; - static_assert(std::is_nothrow_default_constructible<C>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_nothrow_default_constructible<C>::value, ""); } { typedef std::map<MoveOnly, MoveOnly, std::less<MoveOnly>, other_allocator<V>> C; |