summaryrefslogtreecommitdiffstats
path: root/libcxx/include/set
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-05-10 13:35:00 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-05-10 13:35:00 +0000
commitec39296875b0723de6eeee1d5669617256bf2e7d (patch)
tree137b1f70bf66768817dd0cf7e7c15cc69bec4467 /libcxx/include/set
parentcd26846fc54c18128f992b9ee7a9771410255f41 (diff)
downloadbcm5719-llvm-ec39296875b0723de6eeee1d5669617256bf2e7d.tar.gz
bcm5719-llvm-ec39296875b0723de6eeee1d5669617256bf2e7d.zip
Fix for LWG Issue 2059: C++0x ambiguity problem with map::erase
llvm-svn: 236950
Diffstat (limited to 'libcxx/include/set')
-rw-r--r--libcxx/include/set2
1 files changed, 2 insertions, 0 deletions
diff --git a/libcxx/include/set b/libcxx/include/set
index 22d794da547..9d64a521da1 100644
--- a/libcxx/include/set
+++ b/libcxx/include/set
@@ -116,6 +116,7 @@ public:
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 @@ public:
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;
OpenPOWER on IntegriCloud