summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxx/test/containers/associative/map/map.cons/default_recursive.pass.cpp9
-rw-r--r--libcxx/test/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp24
-rw-r--r--libcxx/test/containers/associative/multiset/multiset.cons/default_recursive.pass.cpp24
-rw-r--r--libcxx/test/containers/associative/set/set.cons/default_recursive.pass.cpp24
4 files changed, 5 insertions, 76 deletions
diff --git a/libcxx/test/containers/associative/map/map.cons/default_recursive.pass.cpp b/libcxx/test/containers/associative/map/map.cons/default_recursive.pass.cpp
index 485822d4978..5dab7a6faeb 100644
--- a/libcxx/test/containers/associative/map/map.cons/default_recursive.pass.cpp
+++ b/libcxx/test/containers/associative/map/map.cons/default_recursive.pass.cpp
@@ -14,11 +14,12 @@
// map();
#include <map>
-#include <cassert>
+
+struct X
+{
+ std::multimap<int, X> m;
+};
int main()
{
- std::map<std::map<int,double>, std::map<int, double> > m;
- assert(m.empty());
- assert(m.begin() == m.end());
}
diff --git a/libcxx/test/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp b/libcxx/test/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp
deleted file mode 100644
index 2f62ea1701f..00000000000
--- a/libcxx/test/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <map>
-
-// class multimap
-
-// multimap();
-
-#include <map>
-#include <cassert>
-
-int main()
-{
- std::multimap<std::multimap<int,double>, std::multimap<int, double> > m;
- assert(m.empty());
- assert(m.begin() == m.end());
-}
diff --git a/libcxx/test/containers/associative/multiset/multiset.cons/default_recursive.pass.cpp b/libcxx/test/containers/associative/multiset/multiset.cons/default_recursive.pass.cpp
deleted file mode 100644
index 95e3e1944db..00000000000
--- a/libcxx/test/containers/associative/multiset/multiset.cons/default_recursive.pass.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <set>
-
-// class multiset
-
-// multiset();
-
-#include <set>
-#include <cassert>
-
-int main()
-{
- std::multiset<std::multiset<int> > m;
- assert(m.empty());
- assert(m.begin() == m.end());
-}
diff --git a/libcxx/test/containers/associative/set/set.cons/default_recursive.pass.cpp b/libcxx/test/containers/associative/set/set.cons/default_recursive.pass.cpp
deleted file mode 100644
index 307addf108d..00000000000
--- a/libcxx/test/containers/associative/set/set.cons/default_recursive.pass.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//===----------------------------------------------------------------------===//
-//
-// The LLVM Compiler Infrastructure
-//
-// This file is dual licensed under the MIT and the University of Illinois Open
-// Source Licenses. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// <set>
-
-// class set
-
-// set();
-
-#include <set>
-#include <cassert>
-
-int main()
-{
- std::set<std::set<int> > s;
- assert(s.empty());
- assert(s.begin() == s.end());
-}
OpenPOWER on IntegriCloud