From 632609b897c7268bd18997633019dde98dd2e6d6 Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Thu, 19 Mar 2020 17:01:35 +0100
Subject: [PATCH] Core/Misc: C++17 cleanups, commit 1

(cherry picked from commit ac9004a2f9fa7af7c7735168e7bc5c08d6cacca7)
---
 src/server/game/Chat/ChatCommands/ChatCommand.h | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/server/game/Chat/ChatCommands/ChatCommand.h b/src/server/game/Chat/ChatCommands/ChatCommand.h
index 7f35f906776..de6c69cf2a6 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommand.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommand.h
@@ -45,20 +45,7 @@ struct CommandArgsConsumerSingle
 
 struct CommandArgsVariantConsumer
 {
-    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))
-        {
-            val = std::move(v);
-            return next;
-        }
-        else
-            return TryConsumeTo<V, T2, Ts...>(val, args);
-    }
-
-    template <typename V, typename T1>
+    template <typename V, typename T1, typename... Ts>
     static char const* TryConsumeTo(V& val, char const* args)
     {
         T1 v;
@@ -67,6 +54,8 @@ struct CommandArgsVariantConsumer
             val = std::move(v);
             return next;
         }
+        else if constexpr (sizeof...(Ts) > 0)
+            return TryConsumeTo<V, Ts...>(val, args);
         else
             return nullptr;
     }