diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp index 61081e36..4897f386 100644 --- a/include/boost/unordered/unordered_map.hpp +++ b/include/boost/unordered/unordered_map.hpp @@ -677,8 +677,8 @@ template class unordered_map BOOST_UNORDERED_DEPRECATED("Use erase instead") void erase_return_void(const_iterator it) { erase(it); } - void clear(); void swap(unordered_map&); + void clear(); template void merge(boost::unordered_map& source); @@ -1179,8 +1179,8 @@ template class unordered_multimap BOOST_UNORDERED_DEPRECATED("Use erase instead") void erase_return_void(const_iterator it) { erase(it); } - void clear(); void swap(unordered_multimap&); + void clear(); template void merge(boost::unordered_multimap& source); @@ -1485,18 +1485,18 @@ unordered_map::erase(const_iterator first, const_iterator last) return table_.erase_range(first, last); } -template -void unordered_map::clear() -{ - table_.clear(); -} - template void unordered_map::swap(unordered_map& other) { table_.swap(other.table_); } +template +void unordered_map::clear() +{ + table_.clear(); +} + template template void unordered_map::merge( @@ -1904,18 +1904,18 @@ unordered_multimap::erase( return table_.erase_range(first, last); } -template -void unordered_multimap::clear() -{ - table_.clear(); -} - template void unordered_multimap::swap(unordered_multimap& other) { table_.swap(other.table_); } +template +void unordered_multimap::clear() +{ + table_.clear(); +} + // observers template diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp index d2497620..2cf710f5 100644 --- a/include/boost/unordered/unordered_set.hpp +++ b/include/boost/unordered/unordered_set.hpp @@ -416,8 +416,8 @@ template class unordered_set BOOST_UNORDERED_DEPRECATED("Use erase instead") void erase_return_void(const_iterator it) { erase(it); } - void clear(); void swap(unordered_set&); + void clear(); template void merge(boost::unordered_set& source); @@ -887,8 +887,8 @@ template class unordered_multiset BOOST_UNORDERED_DEPRECATED("Use erase instead") void erase_return_void(const_iterator it) { erase(it); } - void clear(); void swap(unordered_multiset&); + void clear(); template void merge(boost::unordered_multiset& source); @@ -1174,6 +1174,12 @@ typename unordered_set::iterator unordered_set::erase( return table_.erase_range(first, last); } +template +void unordered_set::swap(unordered_set& other) +{ + table_.swap(other.table_); +} + template void unordered_set::clear() { @@ -1181,9 +1187,9 @@ void unordered_set::clear() } template -void unordered_set::swap(unordered_set& other) +void unordered_multiset::clear() { - table_.swap(other.table_); + table_.clear(); } // observers @@ -1539,12 +1545,6 @@ unordered_multiset::erase(const_iterator first, const_iterator last) return table_.erase_range(first, last); } -template -void unordered_multiset::clear() -{ - table_.clear(); -} - template void unordered_multiset::swap(unordered_multiset& other) {