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/bnetserver/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/bnetserver/Main.cpp')
| -rw-r--r-- | src/server/bnetserver/Main.cpp | 6 |
1 files changed, 3 insertions, 3 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; |