summaryrefslogtreecommitdiffstats
path: root/libcxx/test/std/containers
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-05-16 17:10:49 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-05-16 17:10:49 +0000
commitfd30fb22c269de2e5aab5e0d0941e47d2131bab4 (patch)
treea635b92b9b5ce50ffa373090eca8ec3d850357ba /libcxx/test/std/containers
parentd9f06c8b8773dbd968bdcd6ba4da750fcaa5436c (diff)
downloadbcm5719-llvm-fd30fb22c269de2e5aab5e0d0941e47d2131bab4.tar.gz
bcm5719-llvm-fd30fb22c269de2e5aab5e0d0941e47d2131bab4.zip
Fix test that was failing on C++03 b/c it was using initializer lists
llvm-svn: 237527
Diffstat (limited to 'libcxx/test/std/containers')
-rw-r--r--libcxx/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
index c40583b297e..3cb0b3b095f 100644
--- a/libcxx/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/std/containers/sequences/vector/vector.cons/assign_initializer_list.pass.cpp
@@ -20,6 +20,7 @@
template <typename Vec>
void test ( Vec &v )
{
+#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
v.assign({3, 4, 5, 6});
assert(v.size() == 4);
assert(is_contiguous_container_asan_correct(v));
@@ -27,11 +28,11 @@ void test ( Vec &v )
assert(v[1] == 4);
assert(v[2] == 5);
assert(v[3] == 6);
+#endif
}
int main()
{
-#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
{
typedef std::vector<int> V;
V d1;
@@ -51,5 +52,4 @@ int main()
test(d2);
}
#endif
-#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}
OpenPOWER on IntegriCloud