diff --git a/src/common/Logging/AppenderConsole.h b/src/common/Logging/AppenderConsole.h index 72c2bf98e1..2f951429d1 100644 --- a/src/common/Logging/AppenderConsole.h +++ b/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::type TypeIndex; + static constexpr AppenderType type = APPENDER_CONSOLE; AppenderConsole(uint8 _id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector 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); diff --git a/src/common/Logging/AppenderFile.h b/src/common/Logging/AppenderFile.h index a320e90eb2..ed75a05409 100644 --- a/src/common/Logging/AppenderFile.h +++ b/src/common/Logging/AppenderFile.h @@ -24,12 +24,12 @@ class TC_COMMON_API AppenderFile : public Appender { public: - typedef std::integral_constant::type TypeIndex; + static constexpr AppenderType type = APPENDER_FILE; AppenderFile(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector 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(); diff --git a/src/common/Logging/Log.h b/src/common/Logging/Log.h index 73d0db64a2..d764e1b801 100644 --- a/src/common/Logging/Log.h +++ b/src/common/Logging/Log.h @@ -92,8 +92,7 @@ class TC_COMMON_API Log template void RegisterAppender() { - using Index = typename AppenderImpl::TypeIndex; - RegisterAppender(Index::value, &CreateAppender); + RegisterAppender(AppenderImpl::type, &CreateAppender); } std::string const& GetLogsDir() const { return m_logsDir; } diff --git a/src/server/database/Logging/AppenderDB.h b/src/server/database/Logging/AppenderDB.h index 093678ca7f..1648c21a15 100644 --- a/src/server/database/Logging/AppenderDB.h +++ b/src/server/database/Logging/AppenderDB.h @@ -23,13 +23,13 @@ class TC_DATABASE_API AppenderDB: public Appender { public: - typedef std::integral_constant::type TypeIndex; + static constexpr AppenderType type = APPENDER_DB; AppenderDB(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags, std::vector extraArgs); ~AppenderDB(); void setRealmId(uint32 realmId) override; - AppenderType getType() const override { return TypeIndex::value; } + AppenderType getType() const override { return type; } private: uint32 realmId;