diff --git a/include/boost/unordered/detail/util.hpp b/include/boost/unordered/detail/util.hpp index 7cfe8dbc..b2a66282 100644 --- a/include/boost/unordered/detail/util.hpp +++ b/include/boost/unordered/detail/util.hpp @@ -204,22 +204,6 @@ namespace boost { namespace unordered { namespace detail { return *bound; } - //////////////////////////////////////////////////////////////////////////// - // pair_cast - because some libraries don't have the full pair constructors. - -#if 0 - template - inline std::pair pair_cast(std::pair const& x) - { - return std::pair(Dst1(x.first), Dst2(x.second)); - } - -#define BOOST_UNORDERED_PAIR_CAST(First, Last, Argument) \ - ::boost::unordered::detail::pair_cast(Argument) -#else -#define BOOST_UNORDERED_PAIR_CAST(First, Last, Argument) \ - Argument -#endif //////////////////////////////////////////////////////////////////////////// // insert_size/initial_size diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp index 389f434f..e11dc166 100644 --- a/include/boost/unordered/unordered_map.hpp +++ b/include/boost/unordered/unordered_map.hpp @@ -854,8 +854,7 @@ namespace unordered std::pair::iterator, bool> unordered_map::emplace(Args&&... args) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(std::forward(args)...)); + return table_.emplace(std::forward(args)...); } template @@ -875,8 +874,7 @@ namespace unordered value_type v ) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(boost::move(v))); + return table_.emplace(boost::move(v)); } template @@ -901,10 +899,7 @@ namespace unordered unordered_map::emplace( \ BOOST_UNORDERED_FUNCTION_PARAMS(z, n)) \ { \ - return \ - BOOST_UNORDERED_PAIR_CAST(iterator, bool, \ - table_.emplace( \ - BOOST_UNORDERED_CALL_PARAMS(z, n))); \ + return table_.emplace(BOOST_UNORDERED_CALL_PARAMS(z, n)); \ } \ \ template \ @@ -932,8 +927,7 @@ namespace unordered std::pair::iterator, bool> unordered_map::insert(value_type const& obj) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(obj)); + return table_.emplace(obj); } template @@ -949,8 +943,7 @@ namespace unordered std::pair::iterator, bool> unordered_map::insert(BOOST_RV_REF(value_type) obj) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(boost::move(obj))); + return table_.emplace(boost::move(obj)); } template @@ -1102,8 +1095,7 @@ namespace unordered BOOST_DEDUCED_TYPENAME unordered_map::iterator> unordered_map::equal_range(const key_type& k) { - return BOOST_UNORDERED_PAIR_CAST(iterator, iterator, - table_.equal_range(k)); + return table_.equal_range(k); } template @@ -1112,8 +1104,7 @@ namespace unordered BOOST_DEDUCED_TYPENAME unordered_map::const_iterator> unordered_map::equal_range(const key_type& k) const { - return BOOST_UNORDERED_PAIR_CAST(const_iterator, const_iterator, - table_.equal_range(k)); + return table_.equal_range(k); } template @@ -1516,8 +1507,7 @@ namespace unordered BOOST_DEDUCED_TYPENAME unordered_multimap::iterator> unordered_multimap::equal_range(const key_type& k) { - return BOOST_UNORDERED_PAIR_CAST(iterator, iterator, - table_.equal_range(k)); + return table_.equal_range(k); } template @@ -1526,8 +1516,7 @@ namespace unordered BOOST_DEDUCED_TYPENAME unordered_multimap::const_iterator> unordered_multimap::equal_range(const key_type& k) const { - return BOOST_UNORDERED_PAIR_CAST(const_iterator, const_iterator, - table_.equal_range(k)); + return table_.equal_range(k); } template diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp index a42cca30..c8ef4a2e 100644 --- a/include/boost/unordered/unordered_set.hpp +++ b/include/boost/unordered/unordered_set.hpp @@ -821,8 +821,7 @@ namespace unordered std::pair::iterator, bool> unordered_set::emplace(Args&&... args) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(std::forward(args)...)); + return table_.emplace(std::forward(args)...); } template @@ -841,8 +840,7 @@ namespace unordered value_type v ) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(boost::move(v))); + return table_.emplace(boost::move(v)); } template @@ -866,10 +864,7 @@ namespace unordered unordered_set::emplace( \ BOOST_UNORDERED_FUNCTION_PARAMS(z, n)) \ { \ - return \ - BOOST_UNORDERED_PAIR_CAST(iterator, bool, \ - table_.emplace( \ - BOOST_UNORDERED_CALL_PARAMS(z, n))); \ + return table_.emplace(BOOST_UNORDERED_CALL_PARAMS(z, n)); \ } \ \ template \ @@ -897,8 +892,7 @@ namespace unordered std::pair::iterator, bool> unordered_set::insert(value_type const& obj) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(obj)); + return table_.emplace(obj); } template @@ -914,8 +908,7 @@ namespace unordered std::pair::iterator, bool> unordered_set::insert(BOOST_RV_REF(value_type) obj) { - return BOOST_UNORDERED_PAIR_CAST(iterator, bool, - table_.emplace(boost::move(obj))); + return table_.emplace(boost::move(obj)); } template @@ -1025,8 +1018,7 @@ namespace unordered BOOST_DEDUCED_TYPENAME unordered_set::const_iterator> unordered_set::equal_range(const key_type& k) const { - return BOOST_UNORDERED_PAIR_CAST(const_iterator, const_iterator, - table_.equal_range(k)); + return table_.equal_range(k); } template @@ -1406,8 +1398,7 @@ namespace unordered BOOST_DEDUCED_TYPENAME unordered_multiset::const_iterator> unordered_multiset::equal_range(const key_type& k) const { - return BOOST_UNORDERED_PAIR_CAST(const_iterator, const_iterator, - table_.equal_range(k)); + return table_.equal_range(k); } template