summaryrefslogtreecommitdiffstats
path: root/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2013-06-19 21:29:40 +0000
committerHoward Hinnant <hhinnant@apple.com>2013-06-19 21:29:40 +0000
commit07d3eccd26a600a6cad3bb6807880f46a76f269e (patch)
tree8f9a3056982d04fbb15a89146326e7a7834aabe5 /libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
parent64f440518b3dc41da99ace80d9289bfa8d92aa15 (diff)
downloadbcm5719-llvm-07d3eccd26a600a6cad3bb6807880f46a76f269e.tar.gz
bcm5719-llvm-07d3eccd26a600a6cad3bb6807880f46a76f269e.zip
Implement full support for non-pointer types in custom allocators. This is for the associative containers only. This work still needs to be done on the unordered and sequence containers. Fixes http://llvm.org/bugs/show_bug.cgi?id=15978
llvm-svn: 184358
Diffstat (limited to 'libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp')
-rw-r--r--libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
index 3087c2e4408..aa3b6e2e6d2 100644
--- a/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multimap/multimap.cons/alloc.pass.cpp
@@ -17,13 +17,26 @@
#include <cassert>
#include "../../../test_allocator.h"
+#include "../../../min_allocator.h"
int main()
{
+ {
typedef std::less<int> C;
typedef test_allocator<std::pair<const int, double> > A;
std::multimap<int, double, C, A> m(A(5));
assert(m.empty());
assert(m.begin() == m.end());
assert(m.get_allocator() == A(5));
+ }
+#if __cplusplus >= 201103L
+ {
+ typedef std::less<int> C;
+ typedef min_allocator<std::pair<const int, double> > A;
+ std::multimap<int, double, C, A> m(A{});
+ assert(m.empty());
+ assert(m.begin() == m.end());
+ assert(m.get_allocator() == A());
+ }
+#endif
}
OpenPOWER on IntegriCloud