summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-07-24 23:49:42 +0000
committerEric Fiselier <eric@efcs.ca>2016-07-24 23:49:42 +0000
commit44b4f6b85c8923de1eb65e803ae702c2a9588a35 (patch)
tree55ca39d2a8a16587f9797fca2ed8d5d7d147b23b /libcxx/test/std/containers
parent8c48ebd41298a705d15d981f967d0685108bf369 (diff)
downloadbcm5719-llvm-44b4f6b85c8923de1eb65e803ae702c2a9588a35.tar.gz
bcm5719-llvm-44b4f6b85c8923de1eb65e803ae702c2a9588a35.zip
Fix a non-standard allocator in vector tests. Patch from STL@microsoft.com
llvm-svn: 276588
Diffstat (limited to 'libcxx/test/std/containers')
-rw-r--r--libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
index f40088ea3e8..7d6215ba99a 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter_alloc.pass.cpp
@@ -40,6 +40,9 @@ struct implicit_conv_allocator : min_allocator<T>
{
implicit_conv_allocator(void*) {}
implicit_conv_allocator(const implicit_conv_allocator&) = default;
+
+ template <class U>
+ implicit_conv_allocator(implicit_conv_allocator<U>) {}
};
#endif
OpenPOWER on IntegriCloud