From 857f8d9231d148d4f2def9c83548b40059923029 Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 19 Mar 2020 17:18:01 +0100 Subject: Core/Misc: C++17 cleanups, commit 2, the advstd commit --- src/common/Cryptography/CryptoGenerics.h | 6 +- src/common/Encoding/BaseEncoding.h | 2 +- src/common/Utilities/Containers.h | 14 +-- src/common/Utilities/EventProcessor.h | 2 +- src/common/Utilities/FuzzyFind.h | 2 +- src/common/Utilities/advstd.h | 108 +-------------------- src/server/game/Chat/ChatCommands/ChatCommand.h | 6 +- .../game/Chat/ChatCommands/ChatCommandArgs.h | 10 +- .../game/Chat/ChatCommands/ChatCommandHelpers.h | 2 +- .../game/Chat/ChatCommands/ChatCommandTags.h | 2 +- src/server/game/Chat/Hyperlinks.h | 4 +- 11 files changed, 26 insertions(+), 132 deletions(-) (limited to 'src') diff --git a/src/common/Cryptography/CryptoGenerics.h b/src/common/Cryptography/CryptoGenerics.h index baf5e95bcfd..e927139215d 100644 --- a/src/common/Cryptography/CryptoGenerics.h +++ b/src/common/Cryptography/CryptoGenerics.h @@ -35,7 +35,7 @@ namespace Trinity static typename Cipher::IV GenerateRandomIV() { typename Cipher::IV iv; - int status = RAND_bytes(advstd::data(iv), advstd::size(iv)); + int status = RAND_bytes(std::data(iv), std::size(iv)); ASSERT(status); return iv; } @@ -49,8 +49,8 @@ namespace Trinity template static void SplitFromBack(std::vector& data, C& tail) { - ASSERT(data.size() >= advstd::size(tail)); - for (size_t i = 1, N = advstd::size(tail); i <= N; ++i) + ASSERT(data.size() >= std::size(tail)); + for (size_t i = 1, N = std::size(tail); i <= N; ++i) { tail[N - i] = data.back(); data.pop_back(); diff --git a/src/common/Encoding/BaseEncoding.h b/src/common/Encoding/BaseEncoding.h index f1136919da6..ef484015936 100644 --- a/src/common/Encoding/BaseEncoding.h +++ b/src/common/Encoding/BaseEncoding.h @@ -32,7 +32,7 @@ template struct GenericBaseEncoding { static constexpr std::size_t BITS_PER_CHAR = Encoding::BITS_PER_CHAR; - static constexpr std::size_t PAD_TO = advstd::lcm(8u, BITS_PER_CHAR); + static constexpr std::size_t PAD_TO = std::lcm(8u, BITS_PER_CHAR); static_assert(BITS_PER_CHAR < 8, "Encoding parameters are invalid"); diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h index 916a43cbd14..ad3887e2123 100644 --- a/src/common/Utilities/Containers.h +++ b/src/common/Utilities/Containers.h @@ -77,10 +77,10 @@ namespace Trinity void RandomResize(C& container, std::size_t requestedSize) { static_assert(std::is_base_of::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 +119,7 @@ namespace Trinity inline auto SelectRandomContainerElement(C const& container) -> typename std::add_const::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 +152,7 @@ namespace Trinity auto SelectRandomWeightedContainerElement(C const& container, Fn weightExtractor) -> decltype(std::begin(container)) { std::vector weights; - weights.reserve(advstd::size(container)); + weights.reserve(std::size(container)); double weightSum = 0.0; for (auto& val : container) { @@ -161,7 +161,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); } @@ -231,7 +231,7 @@ namespace Trinity } template - std::enable_if_t().begin())>, void> EraseIf(Container& c, Predicate p) + std::enable_if_t().begin())>, void> EraseIf(Container& c, Predicate p) { auto wpos = c.begin(); for (auto rpos = c.begin(), end = c.end(); rpos != end; ++rpos) @@ -247,7 +247,7 @@ namespace Trinity } template - std::enable_if_t().begin())>, void> EraseIf(Container& c, Predicate p) + std::enable_if_t().begin())>, void> EraseIf(Container& c, Predicate p) { for (auto it = c.begin(); it != c.end();) { diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h index 304dbb3642c..a64bd4ffc2d 100644 --- a/src/common/Utilities/EventProcessor.h +++ b/src/common/Utilities/EventProcessor.h @@ -88,7 +88,7 @@ private: }; template -using is_lambda_event = std::enable_if_t>>>; +using is_lambda_event = std::enable_if_t>>>; class TC_COMMON_API EventProcessor { diff --git a/src/common/Utilities/FuzzyFind.h b/src/common/Utilities/FuzzyFind.h index ae511456aa3..69dfd351d56 100644 --- a/src/common/Utilities/FuzzyFind.h +++ b/src/common/Utilities/FuzzyFind.h @@ -30,7 +30,7 @@ namespace Trinity auto FuzzyFindIn(Container const& container, NeedleContainer const& needles, ContainsOperator const& contains = StringContainsStringI, int(*bonus)(decltype((*std::begin(std::declval())))) = nullptr) { using IteratorResult = decltype((*std::begin(container))); - using MappedType = std::conditional_t, std::reference_wrapper>, IteratorResult>; + using MappedType = std::conditional_t, std::reference_wrapper>, IteratorResult>; std::multimap> results; for (auto outerIt = std::begin(container), outerEnd = std::end(container); outerIt != outerEnd; ++outerIt) diff --git a/src/common/Utilities/advstd.h b/src/common/Utilities/advstd.h index 0b51e9bc6dc..fc8221b7314 100644 --- a/src/common/Utilities/advstd.h +++ b/src/common/Utilities/advstd.h @@ -19,118 +19,12 @@ #define TRINITY_ADVSTD_H #include -#include #include -#include // this namespace holds implementations of upcoming stdlib features that our c++ version doesn't have yet namespace advstd { - // C++17 std::apply (constrained to only function pointers, not all callable) - template - using apply_tuple_type = std::tuple>...>; - template - R apply_impl(R(*func)(Ts...), apply_tuple_type&& args, std::index_sequence) - { - return func(std::get(std::forward>(args))...); - } - template - R apply(R(*func)(Ts...), apply_tuple_type&& args) - { - return apply_impl(func, std::forward>(args), std::index_sequence_for{}); - } - -#define forward_1v(stdname, type) template constexpr type stdname ## _v = std::stdname::value -#define forward_2v(stdname, type) template constexpr type stdname ## _v = std::stdname::value - - // C++17 std::is_same_v - forward_2v(is_same, bool); - - // C++17 std::is_integral_v - forward_1v(is_integral, bool); - - // C++17 std::is_assignable_v - forward_2v(is_assignable, bool); - - // C++17 std::is_signed_v - forward_1v(is_signed, bool); - - // C++17 std::is_unsigned_v - forward_1v(is_unsigned, bool); - - // C++17 std::is_base_of_v - forward_2v(is_base_of, bool); - - // C++17 std::is_floating_point_v - forward_1v(is_floating_point, bool); - - // C++17 std::is_pointer_v - forward_1v(is_pointer, bool); - - // C++17 std::is_reference_v - forward_1v(is_reference, bool); - - // C++17 std::tuple_size_v - forward_1v(tuple_size, size_t); - - // C++17 std::is_enum_v - forward_1v(is_enum, bool); - - // C++17 std::is_arithmetic_v - forward_1v(is_arithmetic, bool); - - // C++17 std::is_move_assignable_v - forward_1v(is_move_assignable, bool); - -#undef forward_1v -#undef forward_2v - - // C++17 std::size - template - constexpr auto size(const C& c) { return c.size(); } - - template - constexpr std::size_t size(const T(&)[N]) noexcept { return N; } - - // C++17 std::data - template - constexpr auto data(C& c) { return c.data(); } - - template - constexpr auto data(C const& c) { return c.data(); } - - template - constexpr T* data(T(&a)[N]) noexcept { return a; } - - template - constexpr T const* data(const T(&a)[N]) noexcept { return a; } - - template - constexpr T const* data(std::initializer_list l) noexcept { return l.begin(); } - - // C++17 std::gcd - template - constexpr std::enable_if_t && advstd::is_unsigned_v, std::common_type_t> gcd(T1 _m, T2 _n) - { - using T = std::common_type_t; - T n=_n, m=_m; - while (n) - { - T o = m; - m = n; - n = o%n; - } - return m; - } - - // C++17 std::lcm - template - constexpr std::enable_if_t && advstd::is_unsigned_v, std::common_type_t> lcm(T1 m, T2 n) - { - return (m/gcd(m, n))*n; - } - - // C++20 std::remove_cvref_t + // C++20 advstd::remove_cvref_t template using remove_cvref_t = std::remove_cv_t>; } diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.h b/src/server/game/Chat/ChatCommands/ChatCommand.h index e29a5f75c9d..fdcf38745ad 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.h +++ b/src/server/game/Chat/ChatCommands/ChatCommand.h @@ -203,7 +203,7 @@ class TC_GAME_API CommandArgs char const* _args; }; -template struct ChatCommandHandlerToTuple { static_assert(!advstd::is_same_v, "Invalid command handler signature"); }; +template struct ChatCommandHandlerToTuple { static_assert(!std::is_same_v, "Invalid command handler signature"); }; template struct ChatCommandHandlerToTuple { using type = std::tuple...>; }; template struct ChatCommandStoreLastArg { static void store(T&, CommandArgs&) {} }; @@ -229,9 +229,9 @@ class TC_GAME_API ChatCommand CommandArgs args(argsStr); if (args.TryConsumeToTuple<1>(arguments)) { - auto& last = std::get-1>(arguments); + auto& last = std::get-1>(arguments); ChatCommandStoreLastArg>::store(last, args); - return advstd::apply(reinterpret_cast(handler), std::move(arguments)); + return std::apply(reinterpret_cast(handler), std::move(arguments)); } else return false; diff --git a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h index db7d852a63d..c5379cdd44a 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandArgs.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandArgs.h @@ -38,11 +38,11 @@ namespace ChatCommands |* *| \****************************************************************************************/ template -struct ArgInfo { static_assert(!advstd::is_same_v, "Invalid command parameter type - see ChatCommandArgs.h for possible types"); }; +struct ArgInfo { static_assert(!std::is_same_v, "Invalid command parameter type - see ChatCommandArgs.h for possible types"); }; // catch-all for signed integral types template -struct ArgInfo && advstd::is_signed_v>> +struct ArgInfo && std::is_signed_v>> { static char const* TryConsume(T& val, char const* args) { @@ -56,7 +56,7 @@ struct ArgInfo && advstd::is_signed // catch-all for unsigned integral types template -struct ArgInfo && advstd::is_unsigned_v>> +struct ArgInfo && std::is_unsigned_v>> { static char const* TryConsume(T& val, char const* args) { @@ -70,7 +70,7 @@ struct ArgInfo && advstd::is_unsign // catch-all for floating point types template -struct ArgInfo>> +struct ArgInfo>> { static char const* TryConsume(T& val, char const* args) { @@ -101,7 +101,7 @@ struct ArgInfo // a container tag template -struct ArgInfo>> +struct ArgInfo>> { static char const* TryConsume(T& tag, char const* args) { diff --git a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h index a0d3b0bb8aa..44ee429b081 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h @@ -57,7 +57,7 @@ struct are_all_assignable template struct are_all_assignable { - static constexpr bool value = advstd::is_assignable_v && are_all_assignable::value; + static constexpr bool value = std::is_assignable_v && are_all_assignable::value; }; template diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h index 6a838f2780d..1870b9a0c3f 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h @@ -45,7 +45,7 @@ namespace ChatCommands \****************************************************************************************/ struct ContainerTag {}; template -struct tag_base>> +struct tag_base>> { using type = typename T::value_type; }; diff --git a/src/server/game/Chat/Hyperlinks.h b/src/server/game/Chat/Hyperlinks.h index e23b359fc1a..cc7b175ff11 100644 --- a/src/server/game/Chat/Hyperlinks.h +++ b/src/server/game/Chat/Hyperlinks.h @@ -107,7 +107,7 @@ namespace LinkTags { } template - static std::enable_if_t && advstd::is_unsigned_v, bool> StoreTo(T& val, char const* pos, size_t len) + static std::enable_if_t && std::is_unsigned_v, bool> StoreTo(T& val, char const* pos, size_t len) { try { val = std::stoull(std::string(pos, len)); } catch (...) { return false; } @@ -115,7 +115,7 @@ namespace LinkTags { } template - static std::enable_if_t && advstd::is_signed_v, bool> StoreTo(T& val, char const* pos, size_t len) + static std::enable_if_t && std::is_signed_v, bool> StoreTo(T& val, char const* pos, size_t len) { try { val = std::stoll(std::string(pos, len)); } catch (...) { return false; } -- cgit v1.2.3