Merge pull request #15297 from StormBytePP/3.3.5_rename_Revision.h

Core/Build: Renamed Revision.h to GitRevision.h to avoid compile failure when old revision.h file is present
(cherry picked from commit 360cc93357d1b51258986e547ac29dddac20159c)

Conflicts:
	src/server/authserver/Main.cpp
	src/server/database/Updater/DBUpdater.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/World/World.cpp
	src/server/shared/PrecompiledHeaders/sharedPCH.h
	src/server/worldserver/Main.cpp

10 files changed, 37 insertions, 37 deletions

diff --git a/src/server/bnetserver/Main.cpp b/src/server/bnetserver/Main.cpp
index 0aa5f748635..c78b175bd83 100644
--- a/src/server/bnetserver/Main.cpp
+++ b/src/server/bnetserver/Main.cpp
@@ -34,7 +34,7 @@
 #include "AppenderDB.h"
 #include "ProcessPriority.h"
 #include "RealmList.h"
-#include "Revision.h"
+#include "GitRevision.h"
 #include "Util.h"
 #include "ZmqContext.h"
 #include "DatabaseLoader.h"
@@ -108,7 +108,7 @@ int main(int argc, char** argv)
     sLog->RegisterAppender<AppenderDB>();
     sLog->Initialize(nullptr);
 
-    TC_LOG_INFO("server.bnetserver", "%s (bnetserver)", Revision::GetFullVersion());
+    TC_LOG_INFO("server.bnetserver", "%s (bnetserver)", GitRevision::GetFullVersion());
     TC_LOG_INFO("server.bnetserver", "<Ctrl-C> to stop.\n");
     TC_LOG_INFO("server.bnetserver", "Using configuration file %s.", configFile.c_str());
     TC_LOG_INFO("server.bnetserver", "Using SSL version: %s (library: %s)", OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
@@ -307,7 +307,7 @@ variables_map GetConsoleArguments(int argc, char** argv, std::string& configFile
     }
     else if (variablesMap.count("version"))
     {
-        std::cout << Revision::GetFullVersion() << "\n";
+        std::cout << GitRevision::GetFullVersion() << "\n";
     }
 
     return variablesMap;
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index cd35b2df4e7..8237a9759ef 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -76,7 +76,7 @@
 #include "QuestDef.h"
 #include "QuestPackets.h"
 #include "ReputationMgr.h"
-#include "Revision.h"
+#include "GitRevision.h"
 #include "SkillDiscovery.h"
 #include "SocialMgr.h"
 #include "Spell.h"
@@ -14620,8 +14620,8 @@ void Player::AddQuest(Quest const* quest, Object* questGiver)
         PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_QUEST_TRACK);
         stmt->setUInt32(0, quest_id);
         stmt->setUInt64(1, GetGUID().GetCounter());
-        stmt->setString(2, Revision::GetHash());
-        stmt->setString(3, Revision::GetDate());
+        stmt->setString(2, GitRevision::GetHash());
+        stmt->setString(3, GitRevision::GetDate());
 
         // add to Quest Tracker
         CharacterDatabase.Execute(stmt);
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index 3afd38a2bff..3dc6b72157a 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -44,7 +44,7 @@
 #include "Player.h"
 #include "QueryPackets.h"
 #include "ReputationMgr.h"
-#include "Revision.h"
+#include "GitRevision.h"
 #include "ScriptMgr.h"
 #include "SharedDefines.h"
 #include "SocialMgr.h"
@@ -956,7 +956,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
     // send server info
     {
         if (sWorld->getIntConfig(CONFIG_ENABLE_SINFO_LOGIN) == 1)
-            chH.PSendSysMessage(Revision::GetFullVersion());
+            chH.PSendSysMessage(GitRevision::GetFullVersion());
 
         TC_LOG_DEBUG("network", "WORLD: Sent server info");
     }
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 10619116307..cbb21f05891 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -53,7 +53,7 @@
 #include "OutdoorPvPMgr.h"
 #include "Player.h"
 #include "PoolMgr.h"
-#include "Revision.h"
+#include "GitRevision.h"
 #include "ScriptMgr.h"
 #include "SkillDiscovery.h"
 #include "SkillExtraItems.h"
@@ -1910,7 +1910,7 @@ void World::SetInitialWorldSettings()
     m_startTime = m_gameTime;
 
     LoginDatabase.PExecute("INSERT INTO uptime (realmid, starttime, uptime, revision) VALUES(%u, %u, 0, '%s')",
-                            realmHandle.Index, uint32(m_startTime), Revision::GetFullVersion());       // One-time query
+                            realmHandle.Index, uint32(m_startTime), GitRevision::GetFullVersion());       // One-time query
 
     m_timers[WUPDATE_WEATHERS].SetInterval(1*IN_MILLISECONDS);
     m_timers[WUPDATE_AUCTIONS].SetInterval(MINUTE*IN_MILLISECONDS);
diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp
index 5f844ab826b..e65ac5f2105 100644
--- a/src/server/scripts/Commands/cs_server.cpp
+++ b/src/server/scripts/Commands/cs_server.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 #include "ObjectAccessor.h"
 #include "Player.h"
 #include "ScriptMgr.h"
-#include "Revision.h"
+#include "GitRevision.h"
 
 class server_commandscript : public CommandScript
 {
@@ -115,7 +115,7 @@ public:
         std::string uptime          = secsToTimeString(sWorld->GetUptime());
         uint32 updateTime           = sWorld->GetUpdateTime();
 
-        handler->SendSysMessage(Revision::GetFullVersion());
+        handler->SendSysMessage(GitRevision::GetFullVersion());
         handler->PSendSysMessage(LANG_CONNECTED_PLAYERS, playersNum, maxPlayersNum);
         handler->PSendSysMessage(LANG_CONNECTED_USERS, activeClientsNum, maxActiveClientsNum, queuedClientsNum, maxQueuedClientsNum);
         handler->PSendSysMessage(LANG_UPTIME, uptime.c_str());
diff --git a/src/server/shared/Debugging/WheatyExceptionReport.cpp b/src/server/shared/Debugging/WheatyExceptionReport.cpp
index 70aa23a8eed..7cf109b4070 100644
--- a/src/server/shared/Debugging/WheatyExceptionReport.cpp
+++ b/src/server/shared/Debugging/WheatyExceptionReport.cpp
@@ -20,7 +20,7 @@
 #include "WheatyExceptionReport.h"
 
 #include "Common.h"
-#include "Revision.h"
+#include "GitRevision.h"
 
 #define CrashFolder _T("Crashes")
 #pragma comment(linker, "/DEFAULTLIB:dbghelp.lib")
@@ -130,10 +130,10 @@ PEXCEPTION_POINTERS pExceptionInfo)
     SYSTEMTIME systime;
     GetLocalTime(&systime);
     sprintf(m_szDumpFileName, "%s\\%s_%s_[%u-%u_%u-%u-%u].dmp",
-        crash_folder_path, Revision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
+        crash_folder_path, GitRevision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
 
     sprintf(m_szLogFileName, "%s\\%s_%s_[%u-%u_%u-%u-%u].txt",
-        crash_folder_path, Revision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
+        crash_folder_path, GitRevision::GetHash(), pos, systime.wDay, systime.wMonth, systime.wHour, systime.wMinute, systime.wSecond);
 
     m_hDumpFile = CreateFile(m_szDumpFileName,
         GENERIC_WRITE,
@@ -439,7 +439,7 @@ PEXCEPTION_POINTERS pExceptionInfo)
         GetLocalTime(&systime);
 
         // Start out with a banner
-        _tprintf(_T("Revision: %s\r\n"), Revision::GetFullVersion());
+        _tprintf(_T("Revision: %s\r\n"), GitRevision::GetFullVersion());
         _tprintf(_T("Date %u:%u:%u. Time %u:%u \r\n"), systime.wDay, systime.wMonth, systime.wYear, systime.wHour, systime.wMinute);
         PEXCEPTION_RECORD pExceptionRecord = pExceptionInfo->ExceptionRecord;
 
diff --git a/src/server/shared/Revision.cpp b/src/server/shared/GitRevision.cpp
index 79d53022a9e..59789cf36cb 100644
--- a/src/server/shared/Revision.cpp
+++ b/src/server/shared/GitRevision.cpp
@@ -1,33 +1,33 @@
-#include "Revision.h"
+#include "GitRevision.h"
 #include "CompilerDefs.h"
 #include "revision_data.h"
 
-char const* Revision::GetHash()
+char const* GitRevision::GetHash()
 {
     return _HASH;
 }
 
-char const* Revision::GetDate()
+char const* GitRevision::GetDate()
 {
     return _DATE;
 }
 
-char const* Revision::GetBranch()
+char const* GitRevision::GetBranch()
 {
     return _BRANCH;
 }
 
-char const* Revision::GetSourceDirectory()
+char const* GitRevision::GetSourceDirectory()
 {
     return _SOURCE_DIRECTORY;
 }
 
-char const* Revision::GetMySQLExecutable()
+char const* GitRevision::GetMySQLExecutable()
 {
     return _MYSQL_EXECUTABLE;
 }
 
-char const* Revision::GetFullDatabase()
+char const* GitRevision::GetFullDatabase()
 {
     return _FULL_DATABASE;
 }
@@ -39,7 +39,7 @@ char const* Revision::GetHotfixesDatabase()
 
 #define _PACKAGENAME "TrinityCore"
 
-char const* Revision::GetFullVersion()
+char const* GitRevision::GetFullVersion()
 {
 #if PLATFORM == PLATFORM_WINDOWS
 # ifdef _WIN64
@@ -52,22 +52,22 @@ char const* Revision::GetFullVersion()
 #endif
 }
 
-char const* GetCompanyNameStr()
+char const* GitRevision::GetCompanyNameStr()
 {
     return VER_COMPANYNAME_STR;
 }
 
-char const* GetLegalCopyrightStr()
+char const* GitRevision::GetLegalCopyrightStr()
 {
     return VER_LEGALCOPYRIGHT_STR;
 }
 
-char const* GetFileVersionStr()
+char const* GitRevision::GetFileVersionStr()
 {
     return VER_FILEVERSION_STR;
 }
 
-char const* GetProductVersionStr()
+char const* GitRevision::GetProductVersionStr()
 {
     return VER_PRODUCTVERSION_STR;
 }
diff --git a/src/server/shared/Revision.h b/src/server/shared/GitRevision.h
index efca375c4f9..a5972c581a0 100644
--- a/src/server/shared/Revision.h
+++ b/src/server/shared/GitRevision.h
@@ -15,12 +15,12 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __REVISION_H__
-#define __REVISION_H__
+#ifndef __GITREVISION_H__
+#define __GITREVISION_H__
 
 #include <string>
 
-namespace Revision
+namespace GitRevision
 {
     char const* GetHash();
     char const* GetDate();
diff --git a/src/server/shared/PrecompiledHeaders/sharedPCH.h b/src/server/shared/PrecompiledHeaders/sharedPCH.h
index f4c18f89ec1..366cc977337 100644
--- a/src/server/shared/PrecompiledHeaders/sharedPCH.h
+++ b/src/server/shared/PrecompiledHeaders/sharedPCH.h
@@ -8,4 +8,4 @@
 #include "TypeList.h"
 #include "TaskScheduler.h"
 #include "EventMap.h"
-#include "Revision.h"
+#include "GitRevision.h"
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index e4c97b056a8..5ff8e3b6279 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -39,7 +39,7 @@
 #include "BattlegroundMgr.h"
 #include "TCSoap.h"
 #include "CliRunnable.h"
-#include "Revision.h"
+#include "GitRevision.h"
 #include "WorldSocket.h"
 #include "WorldSocketMgr.h"
 #include "BattlenetServerManager.h"
@@ -130,7 +130,7 @@ extern int main(int argc, char** argv)
     // If logs are supposed to be handled async then we need to pass the io_service into the Log singleton
     sLog->Initialize(sConfigMgr->GetBoolDefault("Log.Async.Enable", false) ? &_ioService : nullptr);
 
-    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon)", Revision::GetFullVersion());
+    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon)", GitRevision::GetFullVersion());
     TC_LOG_INFO("server.worldserver", "<Ctrl-C> to stop.\n");
     TC_LOG_INFO("server.worldserver", " ______                       __");
     TC_LOG_INFO("server.worldserver", "/\\__  _\\       __          __/\\ \\__");
@@ -247,7 +247,7 @@ extern int main(int argc, char** argv)
 
     sBattlenetServer.InitializeConnection();
 
-    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon) ready...", Revision::GetFullVersion());
+    TC_LOG_INFO("server.worldserver", "%s (worldserver-daemon) ready...", GitRevision::GetFullVersion());
 
     sScriptMgr->OnStartup();
 
@@ -556,7 +556,7 @@ bool StartDB()
     ClearOnlineAccounts();
 
     ///- Insert version info into DB
-    WorldDatabase.PExecute("UPDATE version SET core_version = '%s', core_revision = '%s'", Revision::GetFullVersion(), Revision::GetHash());        // One-time query
+    WorldDatabase.PExecute("UPDATE version SET core_version = '%s', core_revision = '%s'", GitRevision::GetFullVersion(), GitRevision::GetHash());        // One-time query
 
     sWorld->LoadDBVersion();
 
@@ -624,7 +624,7 @@ variables_map GetConsoleArguments(int argc, char** argv, std::string& configFile
     }
     else if (vm.count("version"))
     {
-        std::cout << Revision::GetFullVersion() << "\n";
+        std::cout << GitRevision::GetFullVersion() << "\n";
     }
 
     return vm;