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

Decorate containers with more BOOST_FORCEINLINE

Browse Source
This commit is contained in:
Christian Mazakas
2022-10-25 09:01:38 -07:00
parent 2afd1c5c9a
commit 4f0edf9013
3 changed files with 68 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/unordered/detail/foa.hpp
View File

@@ -1299,6 +1299,7 @@ public:
> >
void erase(iterator pos)noexcept{return erase(const_iterator(pos));} void erase(iterator pos)noexcept{return erase(const_iterator(pos));}
BOOST_FORCEINLINE
void erase(const_iterator pos)noexcept void erase(const_iterator pos)noexcept
{ {
destroy_element(pos.p); destroy_element(pos.p);
@@ -1307,6 +1308,7 @@ public:
} }
template<typename Key> template<typename Key>
BOOST_FORCEINLINE
auto erase(Key&& x) -> typename std::enable_if< auto erase(Key&& x) -> typename std::enable_if<
!std::is_convertible<Key,iterator>::value&& !std::is_convertible<Key,iterator>::value&&
!std::is_convertible<Key,const_iterator>::value, std::size_t>::type !std::is_convertible<Key,const_iterator>::value, std::size_t>::type

52
include/boost/unordered/unordered_flat_map.hpp
View File

@@ -26,6 +26,12 @@
namespace boost { namespace boost {
namespace unordered { namespace unordered {
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable : 4714) /* marked as __forceinline not inlined */
#endif
template <class Key, class T, class Hash, class KeyEqual, class Allocator> template <class Key, class T, class Hash, class KeyEqual, class Allocator>
class unordered_flat_map class unordered_flat_map
{ {
@@ -220,7 +226,7 @@ namespace boost {
void clear() noexcept { table_.clear(); } void clear() noexcept { table_.clear(); }
template <class Ty> template <class Ty>
auto insert(Ty&& value) BOOST_FORCEINLINE auto insert(Ty&& value)
-> decltype(table_.insert(std::forward<Ty>(value))) -> decltype(table_.insert(std::forward<Ty>(value)))
{ {
return table_.insert(std::forward<Ty>(value)); return table_.insert(std::forward<Ty>(value));
@@ -232,19 +238,19 @@ namespace boost {
} }
template <class Ty> template <class Ty>
auto insert(const_iterator, Ty&& value) BOOST_FORCEINLINE auto insert(const_iterator, Ty&& value)
-> decltype(table_.insert(std::forward<Ty>(value)).first) -> decltype(table_.insert(std::forward<Ty>(value)).first)
{ {
return table_.insert(std::forward<Ty>(value)).first; return table_.insert(std::forward<Ty>(value)).first;
} }
iterator insert(const_iterator, init_type&& value) BOOST_FORCEINLINE iterator insert(const_iterator, init_type&& value)
{ {
return table_.insert(std::move(value)).first; return table_.insert(std::move(value)).first;
} }
template <class InputIterator> template <class InputIterator>
void insert(InputIterator first, InputIterator last) BOOST_FORCEINLINE void insert(InputIterator first, InputIterator last)
{ {
for (auto pos = first; pos != last; ++pos) { for (auto pos = first; pos != last; ++pos) {
table_.emplace(*pos); table_.emplace(*pos);
@@ -292,44 +298,52 @@ namespace boost {
.first; .first;
} }
template <class... Args> std::pair<iterator, bool> emplace(Args&&... args) template <class... Args>
BOOST_FORCEINLINE std::pair<iterator, bool> emplace(Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(std::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
iterator emplace_hint(const_iterator, Args&&... args) BOOST_FORCEINLINE iterator emplace_hint(const_iterator, Args&&... args)
{ {
return this->emplace(std::forward<Args>(args)...).first; return table_.emplace(std::forward<Args>(args)...).first;
} }
template <class... Args> template <class... Args>
std::pair<iterator, bool> try_emplace(key_type const& key, Args&&... args) BOOST_FORCEINLINE std::pair<iterator, bool> try_emplace(
key_type const& key, Args&&... args)
{ {
return table_.try_emplace(key, std::forward<Args>(args)...); return table_.try_emplace(key, std::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
std::pair<iterator, bool> try_emplace(key_type&& key, Args&&... args) BOOST_FORCEINLINE std::pair<iterator, bool> try_emplace(
key_type&& key, Args&&... args)
{ {
return table_.try_emplace(std::move(key), std::forward<Args>(args)...); return table_.try_emplace(std::move(key), std::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
iterator try_emplace(const_iterator, key_type const& key, Args&&... args) BOOST_FORCEINLINE iterator try_emplace(
const_iterator, key_type const& key, Args&&... args)
{ {
return table_.try_emplace(key, std::forward<Args>(args)...).first; return table_.try_emplace(key, std::forward<Args>(args)...).first;
} }
template <class... Args> template <class... Args>
iterator try_emplace(const_iterator, key_type&& key, Args&&... args) BOOST_FORCEINLINE iterator try_emplace(
const_iterator, key_type&& key, Args&&... args)
{ {
return table_.try_emplace(std::move(key), std::forward<Args>(args)...) return table_.try_emplace(std::move(key), std::forward<Args>(args)...)
.first; .first;
} }
void erase(iterator pos) { table_.erase(pos); } BOOST_FORCEINLINE void erase(iterator pos) { table_.erase(pos); }
void erase(const_iterator pos) { return table_.erase(pos); } BOOST_FORCEINLINE void erase(const_iterator pos)
{
return table_.erase(pos);
}
iterator erase(const_iterator first, const_iterator last) iterator erase(const_iterator first, const_iterator last)
{ {
while (first != last) { while (first != last) {
@@ -338,10 +352,13 @@ namespace boost {
return iterator{detail::foa::const_iterator_cast_tag{}, last}; return iterator{detail::foa::const_iterator_cast_tag{}, last};
} }
size_type erase(key_type const& key) { return table_.erase(key); } BOOST_FORCEINLINE size_type erase(key_type const& key)
{
return table_.erase(key);
}
template <class K> template <class K>
typename std::enable_if< BOOST_FORCEINLINE typename std::enable_if<
detail::transparent_non_iterable<K, unordered_flat_map>::value, detail::transparent_non_iterable<K, unordered_flat_map>::value,
size_type>::type size_type>::type
erase(K const& key) erase(K const& key)
@@ -591,6 +608,11 @@ namespace boost {
{ {
return erase_if(map.table_, pred); return erase_if(map.table_, pred);
} }
#if defined(BOOST_MSVC)
#pragma warning(pop) /* C4714 */
#endif
} // namespace unordered } // namespace unordered
} // namespace boost } // namespace boost

39
include/boost/unordered/unordered_flat_set.hpp
View File

@@ -24,6 +24,12 @@
namespace boost { namespace boost {
namespace unordered { namespace unordered {
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable : 4714) /* marked as __forceinline not inlined */
#endif
template <class Key, class Hash, class KeyEqual, class Allocator> template <class Key, class Hash, class KeyEqual, class Allocator>
class unordered_flat_set class unordered_flat_set
{ {
@@ -201,22 +207,23 @@ namespace boost {
void clear() noexcept { table_.clear(); } void clear() noexcept { table_.clear(); }
std::pair<iterator, bool> insert(value_type const& value) BOOST_FORCEINLINE std::pair<iterator, bool> insert(
value_type const& value)
{ {
return table_.insert(value); return table_.insert(value);
} }
std::pair<iterator, bool> insert(value_type&& value) BOOST_FORCEINLINE std::pair<iterator, bool> insert(value_type&& value)
{ {
return table_.insert(std::move(value)); return table_.insert(std::move(value));
} }
iterator insert(const_iterator, value_type const& value) BOOST_FORCEINLINE iterator insert(const_iterator, value_type const& value)
{ {
return table_.insert(value).first; return table_.insert(value).first;
} }
iterator insert(const_iterator, value_type&& value) BOOST_FORCEINLINE iterator insert(const_iterator, value_type&& value)
{ {
return table_.insert(std::move(value)).first; return table_.insert(std::move(value)).first;
} }
@@ -234,18 +241,22 @@ namespace boost {
this->insert(ilist.begin(), ilist.end()); this->insert(ilist.begin(), ilist.end());
} }
template <class... Args> std::pair<iterator, bool> emplace(Args&&... args) template <class... Args>
BOOST_FORCEINLINE std::pair<iterator, bool> emplace(Args&&... args)
{ {
return table_.emplace(std::forward<Args>(args)...); return table_.emplace(std::forward<Args>(args)...);
} }
template <class... Args> template <class... Args>
iterator emplace_hint(const_iterator, Args&&... args) BOOST_FORCEINLINE iterator emplace_hint(const_iterator, Args&&... args)
{ {
return this->emplace(std::forward<Args>(args)...).first; return table_.emplace(std::forward<Args>(args)...).first;
} }
void erase(const_iterator pos) { return table_.erase(pos); } BOOST_FORCEINLINE void erase(const_iterator pos)
{
return table_.erase(pos);
}
iterator erase(const_iterator first, const_iterator last) iterator erase(const_iterator first, const_iterator last)
{ {
while (first != last) { while (first != last) {
@@ -254,10 +265,13 @@ namespace boost {
return iterator{detail::foa::const_iterator_cast_tag{}, last}; return iterator{detail::foa::const_iterator_cast_tag{}, last};
} }
size_type erase(key_type const& key) { return table_.erase(key); } BOOST_FORCEINLINE size_type erase(key_type const& key)
{
return table_.erase(key);
}
template <class K> template <class K>
typename std::enable_if< BOOST_FORCEINLINE typename std::enable_if<
detail::transparent_non_iterable<K, unordered_flat_set>::value, detail::transparent_non_iterable<K, unordered_flat_set>::value,
size_type>::type size_type>::type
erase(K const& key) erase(K const& key)
@@ -469,6 +483,11 @@ namespace boost {
{ {
return erase_if(set.table_, pred); return erase_if(set.table_, pred);
} }
#if defined(BOOST_MSVC)
#pragma warning(pop) /* C4714 */
#endif
} // namespace unordered } // namespace unordered
} // namespace boost } // namespace boost