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

4 files changed, 20 insertions, 20 deletions

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"