From b3be398c67ddb8d2f98480cc5540607a68b1ac88 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Tue, 3 Mar 2015 20:10:01 +0000
Subject: Allow declaration of map and multimap iterator with incomplete mapped
 type. Patch from eugenis

llvm-svn: 231119
---
 .../map/map.cons/default_recursive.pass.cpp        |  8 +++---
 .../multimap.cons/default_recursive.pass.cpp       | 29 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 libcxx/test/std/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp

(limited to 'libcxx/test/std/containers')

diff --git a/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp
index 8b393d3c91c..b4b72725fd6 100644
--- a/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp
+++ b/libcxx/test/std/containers/associative/map/map.cons/default_recursive.pass.cpp
@@ -15,15 +15,15 @@
 
 #include <map>
 
-#if !__has_feature(cxx_noexcept)
-
 struct X
 {
     std::map<int, X> m;
+    std::map<int, X>::iterator i;
+    std::map<int, X>::const_iterator ci;
+    std::map<int, X>::reverse_iterator ri;
+    std::map<int, X>::const_reverse_iterator cri;
 };
 
-#endif
-
 int main()
 {
 }
diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp
new file mode 100644
index 00000000000..08ca8a441e3
--- /dev/null
+++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/default_recursive.pass.cpp
@@ -0,0 +1,29 @@
+//===----------------------------------------------------------------------===//
+//
+//                     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>
+
+struct X
+{
+    std::multimap<int, X> m;
+    std::multimap<int, X>::iterator i;
+    std::multimap<int, X>::const_iterator ci;
+    std::multimap<int, X>::reverse_iterator ri;
+    std::multimap<int, X>::const_reverse_iterator cri;
+};
+
+int main()
+{
+}
-- 
cgit v1.2.3