commit ec39296875b0723de6eeee1d5669617256bf2e7d
author Marshall Clow <mclow.lists@gmail.com> Sun May 10 13:35:00 2015 +0000
committer Marshall Clow <mclow.lists@gmail.com> Sun May 10 13:35:00 2015 +0000
tree 137b1f70bf66768817dd0cf7e7c15cc69bec4467
parent cd26846fc54c18128f992b9ee7a9771410255f41

Fix for LWG Issue 2059: C++0x ambiguity problem with map::erase

llvm-svn: 236950

libcxx/include/set

diff --git a/libcxx/include/set b/libcxx/include/set
index 22d794d..9d64a52 100644
--- a/libcxx/include/set
+++ b/libcxx/include/set
@@ -116,6 +116,7 @@
     void insert(initializer_list<value_type> il);
 
     iterator  erase(const_iterator position);
+    iterator  erase(iterator position);  // C++14
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
     void clear() noexcept;
@@ -297,6 +298,7 @@
     void insert(initializer_list<value_type> il);
 
     iterator  erase(const_iterator position);
+    iterator  erase(iterator position);  // C++14
     size_type erase(const key_type& k);
     iterator  erase(const_iterator first, const_iterator last);
     void clear() noexcept;