diff options
Diffstat (limited to 'src/common/Utilities/Containers.h')
| -rw-r--r-- | src/common/Utilities/Containers.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h index d7103d32e37..bd7dfd819c3 100644 --- a/src/common/Utilities/Containers.h +++ b/src/common/Utilities/Containers.h @@ -18,7 +18,6 @@ #ifndef TRINITY_CONTAINERS_H #define TRINITY_CONTAINERS_H -#include "advstd.h" #include "Define.h" #include "Random.h" #include <algorithm> @@ -77,10 +76,10 @@ namespace Trinity void RandomResize(C& container, std::size_t requestedSize) { static_assert(std::is_base_of<std::forward_iterator_tag, typename std::iterator_traits<typename C::iterator>::iterator_category>::value, "Invalid container passed to Trinity::Containers::RandomResize"); - if (advstd::size(container) <= requestedSize) + if (std::size(container) <= requestedSize) return; auto keepIt = std::begin(container), curIt = std::begin(container); - uint32 elementsToKeep = requestedSize, elementsToProcess = advstd::size(container); + uint32 elementsToKeep = requestedSize, elementsToProcess = std::size(container); while (elementsToProcess) { // this element has chance (elementsToKeep / elementsToProcess) of being kept @@ -119,7 +118,7 @@ namespace Trinity inline auto SelectRandomContainerElement(C const& container) -> typename std::add_const<decltype(*std::begin(container))>::type& { auto it = std::begin(container); - std::advance(it, urand(0, uint32(advstd::size(container)) - 1)); + std::advance(it, urand(0, uint32(std::size(container)) - 1)); return *it; } @@ -152,7 +151,7 @@ namespace Trinity inline auto SelectRandomWeightedContainerElement(C const& container, Fn weightExtractor) -> decltype(std::begin(container)) { std::vector<double> weights; - weights.reserve(advstd::size(container)); + weights.reserve(std::size(container)); double weightSum = 0.0; for (auto& val : container) { @@ -161,7 +160,7 @@ namespace Trinity weightSum += weight; } if (weightSum <= 0.0) - weights.assign(advstd::size(container), 1.0); + weights.assign(std::size(container), 1.0); return SelectRandomWeightedContainerElement(container, weights); } @@ -262,7 +261,7 @@ namespace Trinity } template <typename Container, typename Predicate> - std::enable_if_t<advstd::is_move_assignable_v<decltype(*std::declval<Container>().begin())>, void> EraseIf(Container& c, Predicate p) + std::enable_if_t<std::is_move_assignable_v<decltype(*std::declval<Container>().begin())>, void> EraseIf(Container& c, Predicate p) { auto wpos = c.begin(); for (auto rpos = c.begin(), end = c.end(); rpos != end; ++rpos) @@ -278,7 +277,7 @@ namespace Trinity } template <typename Container, typename Predicate> - std::enable_if_t<!advstd::is_move_assignable_v<decltype(*std::declval<Container>().begin())>, void> EraseIf(Container& c, Predicate p) + std::enable_if_t<!std::is_move_assignable_v<decltype(*std::declval<Container>().begin())>, void> EraseIf(Container& c, Predicate p) { for (auto it = c.begin(); it != c.end();) { |