Core/Logging reduce difference between branches

src/common/Logging/AppenderConsole.h

@@ -44,11 +44,11 @@ const uint8 MaxColors = uint8(WHITE) + 1;
 class TC_COMMON_API AppenderConsole : public Appender
 {
     public:
-        typedef std::integral_constant<AppenderType, APPENDER_CONSOLE>::type TypeIndex;
+    static constexpr AppenderType type = APPENDER_CONSOLE;
 
         AppenderConsole(uint8 _id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector<char const*> extraArgs);
         void InitColors(const std::string& init_str);
-        AppenderType getType() const override { return TypeIndex::value; }
+        AppenderType getType() const override { return type; }
 
     private:
         void SetColor(bool stdout_stream, ColorTypes color);

src/common/Logging/AppenderFile.h

@@ -24,12 +24,12 @@
 class TC_COMMON_API AppenderFile : public Appender
 {
     public:
-        typedef std::integral_constant<AppenderType, APPENDER_FILE>::type TypeIndex;
+        static constexpr AppenderType type = APPENDER_FILE;
 
         AppenderFile(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector<char const*> extraArgs);
         ~AppenderFile();
         FILE* OpenFile(std::string const& name, std::string const& mode, bool backup);
-        AppenderType getType() const override { return TypeIndex::value; }
+        AppenderType getType() const override { return type; }
 
     private:
         void CloseFile();

src/common/Logging/Log.h

@@ -92,8 +92,7 @@ class TC_COMMON_API Log
         template <class AppenderImpl>
         void RegisterAppender()
         {
-            using Index = typename AppenderImpl::TypeIndex;
-            RegisterAppender(Index::value, &CreateAppender<AppenderImpl>);
+            RegisterAppender(AppenderImpl::type, &CreateAppender<AppenderImpl>);
         }
 
         std::string const& GetLogsDir() const { return m_logsDir; }

src/server/database/Logging/AppenderDB.h

@@ -23,13 +23,13 @@
 class TC_DATABASE_API AppenderDB: public Appender
 {
     public:
-        typedef std::integral_constant<AppenderType, APPENDER_DB>::type TypeIndex;
+        static constexpr AppenderType type = APPENDER_DB;
 
         AppenderDB(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector<char const*> extraArgs);
         ~AppenderDB();
 
         void setRealmId(uint32 realmId) override;
-        AppenderType getType() const override { return TypeIndex::value; }
+        AppenderType getType() const override { return type; }
 
     private:
         uint32 realmId;