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

(cherry picked from commit 857f8d9231d148d4f2def9c83548b40059923029)

8 files changed, 20 insertions, 23 deletions

diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.h b/src/server/game/Chat/ChatCommands/ChatCommand.h
index de6c69cf2a6..03ac769cbe2 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 1ef74c2430f..75d33f5dd60 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 fe6c8d709ca..1e05055c437 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h
@@ -18,7 +18,6 @@
 #ifndef TRINITY_CHATCOMMANDHELPERS_H
 #define TRINITY_CHATCOMMANDHELPERS_H
 
-#include "advstd.h"
 #include <type_traits>
 
 namespace Trinity
@@ -31,9 +30,9 @@ static constexpr char COMMAND_DELIMITER = ' ';
 /***************** HELPERS *************************\
 |* These really aren't for outside use...          *|
 \***************************************************/
-inline size_t tokenize(char const*& end)
+inline std::size_t tokenize(char const*& end)
 {
-    size_t len = 0;
+    std::size_t len = 0;
     for (; *end && *end != COMMAND_DELIMITER; ++end, ++len);
     for (; *end && *end == COMMAND_DELIMITER; ++end);
     return len;
@@ -57,10 +56,10 @@ 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>
+template <std::size_t index, typename T1, typename... Ts>
 struct get_nth : get_nth<index-1, Ts...> { };
 
 template <typename T1, typename... Ts>
@@ -69,7 +68,7 @@ struct get_nth<0, T1, Ts...>
     using type = T1;
 };
 
-template <size_t index, typename... Ts>
+template <std::size_t index, typename... Ts>
 using get_nth_t = typename get_nth<index, Ts...>::type;
 
 }
diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h
index b8fcc0e0062..7de65913a44 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 65d6d595f0a..5aaf0fb7b31 100644
--- a/src/server/game/Chat/Hyperlinks.h
+++ b/src/server/game/Chat/Hyperlinks.h
@@ -18,7 +18,6 @@
 #ifndef TRINITY_HYPERLINKS_H
 #define TRINITY_HYPERLINKS_H
 
-#include "advstd.h"
 #include "ObjectGuid.h"
 #include "Optional.h"
 #include <string>
@@ -229,7 +228,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; }
@@ -237,7 +236,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; }
diff --git a/src/server/game/Entities/Object/ObjectGuid.cpp b/src/server/game/Entities/Object/ObjectGuid.cpp
index e21ceaeb45d..9fec48ea6e0 100644
--- a/src/server/game/Entities/Object/ObjectGuid.cpp
+++ b/src/server/game/Entities/Object/ObjectGuid.cpp
@@ -23,7 +23,6 @@
 #include "Realm.h"
 #include "Util.h"
 #include "World.h"
-#include "advstd.h"
 
 static_assert(sizeof(ObjectGuid) == sizeof(uint64) * 2, "ObjectGuid must be exactly 16 bytes");
 
@@ -104,7 +103,7 @@ namespace
             };
 
             ObjectGuid::LowType id = guid.GetCounter();
-            if (id >= advstd::size(uniqNames))
+            if (id >= std::size(uniqNames))
                 id = 3;
 
             return Trinity::StringFormat("%s-%s", typeName, uniqNames[id]);
@@ -134,7 +133,7 @@ namespace
                 "WOWGUID_UNIQUE_ACCOUNT_OBJ_INITIALIZATION"
             };
 
-            for (std::size_t id = 0; id < advstd::size(uniqNames); ++id)
+            for (std::size_t id = 0; id < std::size(uniqNames); ++id)
             {
                 if (!uniqNames[id])
                     continue;
diff --git a/src/server/game/Entities/Player/CinematicMgr.cpp b/src/server/game/Entities/Player/CinematicMgr.cpp
index 7402f161138..5a3888220b5 100644
--- a/src/server/game/Entities/Player/CinematicMgr.cpp
+++ b/src/server/game/Entities/Player/CinematicMgr.cpp
@@ -46,7 +46,7 @@ CinematicMgr::~CinematicMgr()
 void CinematicMgr::NextCinematicCamera()
 {
     // Sanity check for active camera set
-    if (!m_activeCinematic || m_activeCinematicCameraIndex >= int32(advstd::size(m_activeCinematic->Camera)))
+    if (!m_activeCinematic || m_activeCinematicCameraIndex >= int32(std::size(m_activeCinematic->Camera)))
         return;
 
     uint32 cinematicCameraId = m_activeCinematic->Camera[++m_activeCinematicCameraIndex];
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 913c67997fd..5e1b17d9d0d 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -113,7 +113,7 @@ void Map::DiscoverGridMapFiles()
             && fread(&build, sizeof(build), 1, tileList) == 1
             && fread(&tilesData[0], MAX_NUMBER_OF_GRIDS * MAX_NUMBER_OF_GRIDS, 1, tileList) == 1)
         {
-            i_gridFileExists = std::bitset<MAX_NUMBER_OF_GRIDS * MAX_NUMBER_OF_GRIDS>(tilesData, advstd::size(tilesData));
+            i_gridFileExists = std::bitset<MAX_NUMBER_OF_GRIDS * MAX_NUMBER_OF_GRIDS>(tilesData, std::size(tilesData));
             fclose(tileList);
             return;
         }