summaryrefslogtreecommitdiffstats
path: root/libcxx/test/containers/associative/multiset
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-08-12 21:56:02 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-08-12 21:56:02 +0000
commit54976f2619ab9ccd321acf46dde4c15baeb84694 (patch)
tree43d2d54cc7b628da57bae18fb1031d29fb32896f /libcxx/test/containers/associative/multiset
parentc53dd2ac01eb3044da996ad5b8d30ef85a18cda5 (diff)
downloadbcm5719-llvm-54976f2619ab9ccd321acf46dde4c15baeb84694.tar.gz
bcm5719-llvm-54976f2619ab9ccd321acf46dde4c15baeb84694.zip
Fixed PR10574: http://llvm.org/bugs/show_bug.cgi?id=10574
llvm-svn: 137522
Diffstat (limited to 'libcxx/test/containers/associative/multiset')
-rw-r--r--libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp4
-rw-r--r--libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp4
-rw-r--r--libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp4
-rw-r--r--libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp4
-rw-r--r--libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp4
5 files changed, 10 insertions, 10 deletions
diff --git a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
index 78cec2651f7..4f5691b09bf 100644
--- a/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/insert_initializer_list.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
typedef std::multiset<int> C;
typedef C::value_type V;
C m = {10, 8};
@@ -34,5 +34,5 @@ int main()
assert(*++i == V(6));
assert(*++i == V(8));
assert(*++i == V(10));
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
index 5f263c77da7..a6834afe0db 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/assign_initializer_list.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
typedef std::multiset<int> C;
typedef C::value_type V;
C m = {10, 8};
@@ -32,5 +32,5 @@ int main()
assert(*++i == V(4));
assert(*++i == V(5));
assert(*++i == V(6));
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
index 11204e0d093..4ee2b4daa54 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list.pass.cpp
@@ -18,7 +18,7 @@
int main()
{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
typedef std::multiset<int> C;
typedef C::value_type V;
C m = {1, 2, 3, 4, 5, 6};
@@ -31,5 +31,5 @@ int main()
assert(*++i == V(4));
assert(*++i == V(5));
assert(*++i == V(6));
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
index 80f6d882fc6..c67657aff8a 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare.pass.cpp
@@ -19,7 +19,7 @@
int main()
{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
typedef test_compare<std::less<int> > Cmp;
typedef std::multiset<int, Cmp> C;
typedef C::value_type V;
@@ -34,5 +34,5 @@ int main()
assert(*++i == V(5));
assert(*++i == V(6));
assert(m.key_comp() == Cmp(10));
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
index 4f580565d5d..d0eebadc6c5 100644
--- a/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
+++ b/libcxx/test/containers/associative/multiset/multiset.cons/initializer_list_compare_alloc.pass.cpp
@@ -20,7 +20,7 @@
int main()
{
-#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
typedef test_compare<std::less<int> > Cmp;
typedef test_allocator<int> A;
typedef std::multiset<int, Cmp, A> C;
@@ -37,5 +37,5 @@ int main()
assert(*++i == V(6));
assert(m.key_comp() == Cmp(10));
assert(m.get_allocator() == A(4));
-#endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES
+#endif // _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
}
OpenPOWER on IntegriCloud