diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-01-07 22:38:21 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-08-12 17:56:16 +0200 |
| commit | d251ab647dd4f48603b37b7150627a39e9a30f45 (patch) | |
| tree | 0915800e74a384cc096982f9344fa86f965dadf4 /src/server | |
| parent | 58f0c4b15a48772e4b9280a3e35fba90ecc4c31f (diff) | |
Core/Misc: Migrate our c++20 advstd to standard features
(cherry picked from commit 7830e5a7a1b93b0cd083baa3b70a0cfeb475f5f5)
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommand.h | 3 | ||||
| -rw-r--r-- | src/server/game/Chat/ChatCommands/ChatCommandTags.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.h b/src/server/game/Chat/ChatCommands/ChatCommand.h index 9520a7ce7dd..329eecfc567 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommand.h +++ b/src/server/game/Chat/ChatCommands/ChatCommand.h @@ -18,7 +18,6 @@ #ifndef TRINITY_CHATCOMMAND_H #define TRINITY_CHATCOMMAND_H -#include "advstd.h" #include "ChatCommandArgs.h" #include "ChatCommandTags.h" #include "Define.h" @@ -116,7 +115,7 @@ namespace Trinity::Impl::ChatCommands } template <typename T> struct HandlerToTuple { static_assert(Trinity::dependant_false_v<T>, "Invalid command handler signature"); }; - template <typename... Ts> struct HandlerToTuple<bool(ChatHandler*, Ts...)> { using type = std::tuple<ChatHandler*, advstd::remove_cvref_t<Ts>...>; }; + template <typename... Ts> struct HandlerToTuple<bool(ChatHandler*, Ts...)> { using type = std::tuple<ChatHandler*, std::remove_cvref_t<Ts>...>; }; template <typename T> using TupleType = typename HandlerToTuple<T>::type; struct CommandInvoker diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h index 0e2b79421c4..b90c614e85d 100644 --- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h +++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h @@ -18,7 +18,6 @@ #ifndef TRINITY_CHATCOMMANDTAGS_H #define TRINITY_CHATCOMMANDTAGS_H -#include "advstd.h" #include "ChatCommandHelpers.h" #include "Hyperlinks.h" #include "ObjectGuid.h" @@ -213,7 +212,7 @@ namespace Trinity::ChatCommands struct Hyperlink : Trinity::Impl::ChatCommands::ContainerTag { using value_type = typename linktag::value_type; - using storage_type = advstd::remove_cvref_t<value_type>; + using storage_type = std::remove_cvref_t<value_type>; operator value_type() const { return val; } value_type operator*() const { return val; } |