diff options
| author | jackpoz <giacomopoz@gmail.com> | 2015-08-16 23:27:25 +0200 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-08-16 22:45:18 +0100 |
| commit | 4617d65131e3726fa5ec0395a9e1bee85d849066 (patch) | |
| tree | e05426f3c6b7b195e4d65007bb664f48f85d0dac /src/server/worldserver/Main.cpp | |
| parent | 6a9fc63e412adf7074c2850320cddf007edc3b28 (diff) | |
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
Diffstat (limited to 'src/server/worldserver/Main.cpp')
| -rw-r--r-- | src/server/worldserver/Main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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; |