summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2019-01-29 16:12:45 +0000
committerMarshall Clow <mclow.lists@gmail.com>2019-01-29 16:12:45 +0000
commitc02236b6f570f02c9b268a4c639957052d1a4c78 (patch)
treeaa968d147b0512ae59df8978853ed89b759085a9 /libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
parentdd471681d036ada3743018f0629680c4565dd882 (diff)
downloadbcm5719-llvm-c02236b6f570f02c9b268a4c639957052d1a4c78.tar.gz
bcm5719-llvm-c02236b6f570f02c9b268a4c639957052d1a4c78.zip
Mark some of the behavior in the move w/allocator constructors of deque/unordered containers as 'libc++-specific'. Thanks to Andrey Maksimov for pointing this out.
llvm-svn: 352512
Diffstat (limited to 'libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp')
-rw-r--r--libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
index c0159165811..3342a4edaab 100644
--- a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
+++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp
@@ -17,6 +17,7 @@
#include <map>
#include <cassert>
+#include "test_macros.h"
#include "MoveOnly.h"
#include "../../../test_compare.h"
#include "test_allocator.h"
@@ -62,7 +63,7 @@ int main()
assert(m3 == m2);
assert(m3.get_allocator() == A(7));
assert(m3.key_comp() == C(5));
- assert(m1.empty());
+ LIBCPP_ASSERT(m1.empty());
}
{
typedef std::pair<MoveOnly, MoveOnly> V;
@@ -101,7 +102,7 @@ int main()
assert(m3 == m2);
assert(m3.get_allocator() == A(5));
assert(m3.key_comp() == C(5));
- assert(m1.empty());
+ LIBCPP_ASSERT(m1.empty());
}
{
typedef std::pair<MoveOnly, MoveOnly> V;
@@ -140,7 +141,7 @@ int main()
assert(m3 == m2);
assert(m3.get_allocator() == A(5));
assert(m3.key_comp() == C(5));
- assert(m1.empty());
+ LIBCPP_ASSERT(m1.empty());
}
{
typedef Counter<int> T;
@@ -176,14 +177,14 @@ int main()
M m3(std::move(m1), A());
assert(m3 == m2);
- assert(m1.empty());
+ LIBCPP_ASSERT(m1.empty());
assert(Counter_base::gConstructed == 3*num);
{
M m4(std::move(m2), A(5));
assert(Counter_base::gConstructed == 3*num);
assert(m4 == m3);
- assert(m2.empty());
+ LIBCPP_ASSERT(m2.empty());
}
assert(Counter_base::gConstructed == 2*num);
}
@@ -226,7 +227,7 @@ int main()
assert(m3 == m2);
assert(m3.get_allocator() == A());
assert(m3.key_comp() == C(5));
- assert(m1.empty());
+ LIBCPP_ASSERT(m1.empty());
}
{
typedef std::pair<MoveOnly, MoveOnly> V;
@@ -265,6 +266,6 @@ int main()
assert(m3 == m2);
assert(m3.get_allocator() == A{});
assert(m3.key_comp() == C(5));
- assert(m1.empty());
+ LIBCPP_ASSERT(m1.empty());
}
}
OpenPOWER on IntegriCloud