feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Use as_const to remove any possibility of use-after-move (#272)

Browse Source
This commit is contained in:
Braden Ganetsky
2024-08-06 08:48:13 -05:00
committed by GitHub
parent cd4c1f3713
commit 65f3ea60dd
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/boost/unordered/detail/type_traits.hpp
View File

@ -219,6 +219,17 @@ namespace boost {
using iter_to_alloc_t = using iter_to_alloc_t =
typename std::pair<iter_key_t<T> const, iter_val_t<T> >; typename std::pair<iter_key_t<T> const, iter_val_t<T> >;
#endif #endif
#if BOOST_CXX_VERSION < 201703L
template <class T>
constexpr typename std::add_const<T>::type& as_const(T& t) noexcept
{
return t;
}
template <class T> void as_const(const T&&) = delete;
#else
using std::as_const;
#endif
} // namespace detail } // namespace detail
} // namespace unordered } // namespace unordered
} // namespace boost } // namespace boost

4
include/boost/unordered/unordered_map.hpp
View File

@ -198,7 +198,7 @@ namespace boost {
template <class... Args> std::pair<iterator, bool> emplace(Args&&... args) template <class... Args> std::pair<iterator, bool> emplace(Args&&... args)
{ {
return table_.emplace_unique( return table_.emplace_unique(
table::extractor::extract(std::forward<Args>(args)...), table::extractor::extract(detail::as_const(args)...),
std::forward<Args>(args)...); std::forward<Args>(args)...);
} }
@ -206,7 +206,7 @@ namespace boost {
iterator emplace_hint(const_iterator hint, Args&&... args) iterator emplace_hint(const_iterator hint, Args&&... args)
{ {
return table_.emplace_hint_unique(hint, return table_.emplace_hint_unique(hint,
table::extractor::extract(std::forward<Args>(args)...), table::extractor::extract(detail::as_const(args)...),
std::forward<Args>(args)...); std::forward<Args>(args)...);
} }

4
include/boost/unordered/unordered_set.hpp
View File

@ -194,7 +194,7 @@ namespace boost {
template <class... Args> std::pair<iterator, bool> emplace(Args&&... args) template <class... Args> std::pair<iterator, bool> emplace(Args&&... args)
{ {
return table_.emplace_unique( return table_.emplace_unique(
table::extractor::extract(std::forward<Args>(args)...), table::extractor::extract(detail::as_const(args)...),
std::forward<Args>(args)...); std::forward<Args>(args)...);
} }
@ -202,7 +202,7 @@ namespace boost {
iterator emplace_hint(const_iterator hint, Args&&... args) iterator emplace_hint(const_iterator hint, Args&&... args)
{ {
return table_.emplace_hint_unique(hint, return table_.emplace_hint_unique(hint,
table::extractor::extract(std::forward<Args>(args)...), table::extractor::extract(detail::as_const(args)...),
std::forward<Args>(args)...); std::forward<Args>(args)...);
} }