diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2015-05-10 13:35:00 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2015-05-10 13:35:00 +0000 |
| commit | ec39296875b0723de6eeee1d5669617256bf2e7d (patch) | |
| tree | 137b1f70bf66768817dd0cf7e7c15cc69bec4467 /libcxx/include/unordered_map | |
| parent | cd26846fc54c18128f992b9ee7a9771410255f41 (diff) | |
| download | bcm5719-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/unordered_map')
| -rw-r--r-- | libcxx/include/unordered_map | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map index 51635def159..6cd82f5c9f5 100644 --- a/libcxx/include/unordered_map +++ b/libcxx/include/unordered_map @@ -123,6 +123,7 @@ public: void insert(initializer_list<value_type>); 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; @@ -287,6 +288,7 @@ public: void insert(initializer_list<value_type>); 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; @@ -944,6 +946,8 @@ public: _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __p) {return __table_.erase(__p.__i_);} _LIBCPP_INLINE_VISIBILITY + iterator erase(iterator __p) {return __table_.erase(__p.__i_);} + _LIBCPP_INLINE_VISIBILITY size_type erase(const key_type& __k) {return __table_.__erase_unique(__k);} _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __first, const_iterator __last) @@ -1644,6 +1648,8 @@ public: _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __p) {return __table_.erase(__p.__i_);} _LIBCPP_INLINE_VISIBILITY + iterator erase(iterator __p) {return __table_.erase(__p.__i_);} + _LIBCPP_INLINE_VISIBILITY size_type erase(const key_type& __k) {return __table_.__erase_multi(__k);} _LIBCPP_INLINE_VISIBILITY iterator erase(const_iterator __first, const_iterator __last) |
