Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

build fix for pedantic compilers

Browse Source
This commit is contained in:
Treeston
2018-09-08 23:29:50 +02:00
committed by Aokromes
parent 56d236c9f9
commit 13f45991ea
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Chat/ChatCommands/ChatCommand.h
View File

@@ -45,8 +45,8 @@ struct CommandArgsConsumerSingle
struct CommandArgsVariantConsumer
{
template <typename V, typename T1, typename... Ts>
static std::enable_if_t<0 < sizeof...(Ts), char const*> TryConsumeTo(V& val, char const* args)
template <typename V, typename T1, typename T2, typename... Ts>
static char const* TryConsumeTo(V& val, char const* args)
{
T1 v;
if (char const* next = CommandArgsConsumerSingle<T1>::TryConsumeTo(v, args))
@@ -55,7 +55,7 @@ struct CommandArgsVariantConsumer
return next;
}
else
return TryConsumeTo<V, Ts...>(val, args);
return TryConsumeTo<V, T2, Ts...>(val, args);
}
template <typename V, typename T1>

14
src/server/game/Chat/ChatCommands/ChatCommandTags.h
View File

@@ -52,23 +52,27 @@ struct ExactSequence : public ContainerTag
{
using value_type = void;
template <size_t U = sizeof...(chars)>
static typename std::enable_if_t<U, char const*> TryConsume(char const* pos)
static constexpr bool isSingleChar = !sizeof...(chars);
template <bool C = isSingleChar>
static typename std::enable_if_t<!C, char const*> _TryConsume(char const* pos)
{
if (*(pos++) == c1)
return ExactSequence<chars...>::TryConsume(pos);
return ExactSequence<chars...>::_TryConsume(pos);
else
return nullptr;
}
template <size_t U = sizeof...(chars)>
static typename std::enable_if_t<!U, char const*> TryConsume(char const* pos)
template <bool C = isSingleChar>
static typename std::enable_if_t<C, char const*> _TryConsume(char const* pos)
{
if (*(pos++) != c1)
return nullptr;
// if more of string is left, tokenize should return 0 (otherwise we didn't reach end of token yet)
return *pos && tokenize(pos) ? nullptr : pos;
}
char const* TryConsume(char const* pos) const { return ExactSequence::_TryConsume(pos); }
};
/************************** VARIANT TAG LOGIC *********************************\