Remove implicit conversion from __value_type to value_type in [unordered_][multi]map. This fixes http://llvm.org/bugs/show_bug.cgi?id=16549

llvm-svn: 185711

2 files changed, 6 insertions, 0 deletions

diff --git a/libcxx/test/containers/associative/map/compare.pass.cpp b/libcxx/test/containers/associative/map/compare.pass.cpp
index f5e69173eb1..aa4d5999ff4 100644
--- a/libcxx/test/containers/associative/map/compare.pass.cpp
+++ b/libcxx/test/containers/associative/map/compare.pass.cpp
@@ -14,6 +14,7 @@
 // class map
 
 // http://llvm.org/bugs/show_bug.cgi?id=16538
+// http://llvm.org/bugs/show_bug.cgi?id=16549
 
 #include <map>
 
@@ -26,4 +27,6 @@ int
 main()
 {
     std::map<Key, int>::iterator it = std::map<Key, int>().find(Key(0));
+    std::pair<std::map<Key, int>::iterator, bool> result =
+                        std::map<Key, int>().insert(std::make_pair(Key(0), 0));
 }
diff --git a/libcxx/test/containers/unord/unord.map/compare.pass.cpp b/libcxx/test/containers/unord/unord.map/compare.pass.cpp
index 814c40f2d2b..8979a3a34ad 100644
--- a/libcxx/test/containers/unord/unord.map/compare.pass.cpp
+++ b/libcxx/test/containers/unord/unord.map/compare.pass.cpp
@@ -14,6 +14,7 @@
 // class unordered_map
 
 // http://llvm.org/bugs/show_bug.cgi?id=16538
+// http://llvm.org/bugs/show_bug.cgi?id=16549
 
 #include <unordered_map>
 
@@ -36,4 +37,6 @@ main()
 {
     std::unordered_map<Key, int>::iterator it =
         std::unordered_map<Key, int>().find(Key(0));
+    std::pair<std::unordered_map<Key, int>::iterator, bool> result =
+        std::unordered_map<Key, int>().insert(std::make_pair(Key(0), 0));
 }