diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/bnetserver/REST/LoginRESTService.cpp | 2 | ||||
| -rw-r--r-- | src/server/bnetserver/Server/SslContext.cpp | 2 | ||||
| -rw-r--r-- | src/server/shared/Realm/Realm.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/server/bnetserver/REST/LoginRESTService.cpp b/src/server/bnetserver/REST/LoginRESTService.cpp index 9ce21be9459..30b8a9fda75 100644 --- a/src/server/bnetserver/REST/LoginRESTService.cpp +++ b/src/server/bnetserver/REST/LoginRESTService.cpp @@ -143,7 +143,7 @@ void LoginRESTService::Run() { { "application/json;charset=utf-8", handle_post_plugin }, { "application/json", handle_post_plugin }, - { NULL } + { nullptr, nullptr } }; soap_register_plugin_arg(&soapServer, &http_get, handle_get_plugin); diff --git a/src/server/bnetserver/Server/SslContext.cpp b/src/server/bnetserver/Server/SslContext.cpp index f1b2a185563..3cc62b284dc 100644 --- a/src/server/bnetserver/Server/SslContext.cpp +++ b/src/server/bnetserver/Server/SslContext.cpp @@ -25,7 +25,7 @@ bool Battlenet::SslContext::Initialize() #define LOAD_CHECK(fn) do { fn; \ if (err) \ { \ - TC_LOG_ERROR("server.ssl", #fn ## "failed: %s", err.message().c_str()); \ + TC_LOG_ERROR("server.ssl", #fn " failed: %s", err.message().c_str()); \ return false; \ } } while (0) diff --git a/src/server/shared/Realm/Realm.cpp b/src/server/shared/Realm/Realm.cpp index 2af537b45e5..ca331c7fe27 100644 --- a/src/server/shared/Realm/Realm.cpp +++ b/src/server/shared/Realm/Realm.cpp @@ -16,6 +16,7 @@ */ #include "Realm.h" +#include "StringFormat.h" ip::tcp::endpoint Realm::GetAddressForClient(ip::address const& clientAddr) const { |