mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-02-03 19:13:49 +00:00
Merge branch 'master' into Playerbot
This commit is contained in:
@@ -374,7 +374,7 @@ T ConfigMgr::GetValueDefault(std::string const& name, T const& def, bool showLog
|
||||
if (showLogs)
|
||||
{
|
||||
LOG_WARN("server.loading", "Missing property {} in config file {}, recovered with environment '{}' value.",
|
||||
name.c_str(), _filename.c_str(), envVar->c_str());
|
||||
name, _filename, envVar->c_str());
|
||||
}
|
||||
|
||||
strValue = *envVar;
|
||||
@@ -411,7 +411,7 @@ std::string ConfigMgr::GetValueDefault<std::string>(std::string const& name, std
|
||||
if (showLogs)
|
||||
{
|
||||
LOG_WARN("server.loading", "Missing property {} in config file {}, recovered with environment '{}' value.",
|
||||
name.c_str(), _filename.c_str(), envVar->c_str());
|
||||
name, _filename, envVar->c_str());
|
||||
}
|
||||
|
||||
return *envVar;
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
#include "OpenSSLCrypto.h"
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/crypto.h> // NOTE: this import is NEEDED (even though some IDEs report it as unused)
|
||||
|
||||
#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010000fL
|
||||
#include <vector>
|
||||
|
||||
@@ -29,7 +29,6 @@
|
||||
#include "Timer.h"
|
||||
#include "Tokenize.h"
|
||||
#include <chrono>
|
||||
#include <sstream>
|
||||
|
||||
Log::Log() : AppenderId(0), highestLogLevel(LOG_LEVEL_FATAL)
|
||||
{
|
||||
|
||||
@@ -16,7 +16,6 @@
|
||||
*/
|
||||
|
||||
#include "LogMessage.h"
|
||||
#include "StringFormat.h"
|
||||
#include "Timer.h"
|
||||
|
||||
LogMessage::LogMessage(LogLevel _level, std::string const& _type, std::string_view _text)
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
#include <boost/core/demangle.hpp>
|
||||
#include <cctype>
|
||||
#include <cstdarg>
|
||||
#include <ctime>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <utf8.h>
|
||||
|
||||
Reference in New Issue
Block a user