Core/Misc: C++17 cleanups, commit 2, the advstd commit

5 files changed, 12 insertions, 12 deletions

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 <typename T> struct ChatCommandHandlerToTuple { static_assert(!advstd::is_same_v<T,T>, "Invalid command handler signature"); };
+template <typename T> struct ChatCommandHandlerToTuple { static_assert(!std::is_same_v<T,T>, "Invalid command handler signature"); };
 template <typename... Ts> struct ChatCommandHandlerToTuple<bool(*)(ChatHandler*, Ts...)> { using type = std::tuple<ChatHandler*, advstd::remove_cvref_t<Ts>...>; };
 
 template <typename T> 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<advstd::tuple_size_v<tuple_type>-1>(arguments);
+                    auto& last = std::get<std::tuple_size_v<tuple_type>-1>(arguments);
                     ChatCommandStoreLastArg<advstd::remove_cvref_t<decltype(last)>>::store(last, args);
-                    return advstd::apply(reinterpret_cast<TypedHandler>(handler), std::move(arguments));
+                    return std::apply(reinterpret_cast<TypedHandler>(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 <typename T, typename = void>
-struct ArgInfo { static_assert(!advstd::is_same_v<T,T>, "Invalid command parameter type - see ChatCommandArgs.h for possible types"); };
+struct ArgInfo { static_assert(!std::is_same_v<T,T>, "Invalid command parameter type - see ChatCommandArgs.h for possible types"); };
 
 // catch-all for signed integral types
 template <typename T>
-struct ArgInfo<T, std::enable_if_t<advstd::is_integral_v<T> && advstd::is_signed_v<T>>>
+struct ArgInfo<T, std::enable_if_t<std::is_integral_v<T> && std::is_signed_v<T>>>
 {
     static char const* TryConsume(T& val, char const* args)
     {
@@ -56,7 +56,7 @@ struct ArgInfo<T, std::enable_if_t<advstd::is_integral_v<T> && advstd::is_signed
 
 // catch-all for unsigned integral types
 template <typename T>
-struct ArgInfo<T, std::enable_if_t<advstd::is_integral_v<T> && advstd::is_unsigned_v<T>>>
+struct ArgInfo<T, std::enable_if_t<std::is_integral_v<T> && std::is_unsigned_v<T>>>
 {
     static char const* TryConsume(T& val, char const* args)
     {
@@ -70,7 +70,7 @@ struct ArgInfo<T, std::enable_if_t<advstd::is_integral_v<T> && advstd::is_unsign
 
 // catch-all for floating point types
 template <typename T>
-struct ArgInfo<T, std::enable_if_t<advstd::is_floating_point_v<T>>>
+struct ArgInfo<T, std::enable_if_t<std::is_floating_point_v<T>>>
 {
     static char const* TryConsume(T& val, char const* args)
     {
@@ -101,7 +101,7 @@ struct ArgInfo<std::string, void>
 
 // a container tag
 template <typename T>
-struct ArgInfo<T, std::enable_if_t<advstd::is_base_of_v<ContainerTag, T>>>
+struct ArgInfo<T, std::enable_if_t<std::is_base_of_v<ContainerTag, T>>>
 {
     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 <typename T1, typename T2, typename... Ts>
 struct are_all_assignable<T1, T2, Ts...>
 {
-    static constexpr bool value = advstd::is_assignable_v<T1&, T2> && are_all_assignable<T1, Ts...>::value;
+    static constexpr bool value = std::is_assignable_v<T1&, T2> && are_all_assignable<T1, Ts...>::value;
 };
 
 template <size_t index, typename T1, typename... Ts>
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 <typename T>
-struct tag_base<T, std::enable_if_t<advstd::is_base_of_v<ContainerTag, T>>>
+struct tag_base<T, std::enable_if_t<std::is_base_of_v<ContainerTag, T>>>
 {
     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 <typename T>
-        static std::enable_if_t<advstd::is_integral_v<T> && advstd::is_unsigned_v<T>, bool> StoreTo(T& val, char const* pos, size_t len)
+        static std::enable_if_t<std::is_integral_v<T> && std::is_unsigned_v<T>, 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 <typename T>
-        static std::enable_if_t<advstd::is_integral_v<T> && advstd::is_signed_v<T>, bool> StoreTo(T& val, char const* pos, size_t len)
+        static std::enable_if_t<std::is_integral_v<T> && std::is_signed_v<T>, bool> StoreTo(T& val, char const* pos, size_t len)
         {
             try { val = std::stoll(std::string(pos, len)); }
             catch (...) { return false; }