From 4617d65131e3726fa5ec0395a9e1bee85d849066 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 16 Aug 2015 23:27:25 +0200 Subject: 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 --- src/server/shared/Debugging/WheatyExceptionReport.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/shared/Debugging') 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; -- cgit v1.2.3