mirror of
https://github.com/EQEmu/Server.git
synced 2026-09-05 11:26:35 +00:00
Crash and compile issues on windows
This commit is contained in:
@@ -81,12 +81,12 @@ namespace EQEmuCommand {
|
||||
|
||||
if (!arguments_filled || argc == 2) {
|
||||
std::string arguments_string;
|
||||
for (auto &arg : arguments) {
|
||||
for (auto &arg : arguments) {
|
||||
arguments_string += " " + arg + "=*\n";
|
||||
}
|
||||
|
||||
std::string options_string;
|
||||
for (auto &opt : options) {
|
||||
for (auto &opt : options) {
|
||||
options_string += " " + opt + "\n";
|
||||
}
|
||||
|
||||
|
||||
@@ -440,7 +440,7 @@ void EQEmuLogSys::Out(
|
||||
const char *file,
|
||||
const char *func,
|
||||
int line,
|
||||
const std::string &message,
|
||||
const char *message,
|
||||
...
|
||||
)
|
||||
{
|
||||
@@ -470,10 +470,9 @@ void EQEmuLogSys::Out(
|
||||
prefix = fmt::format("[{0}::{1}:{2}] ", base_file_name(file), func, line);
|
||||
}
|
||||
|
||||
auto msg_cstr = message.c_str();
|
||||
va_list args;
|
||||
va_start(args, msg_cstr);
|
||||
std::string output_message = vStringFormat(msg_cstr, args);
|
||||
va_start(args, message);
|
||||
std::string output_message = vStringFormat(message, args);
|
||||
va_end(args);
|
||||
|
||||
std::string output_debug_message = EQEmuLogSys::FormatOutMessageString(log_category, prefix + output_message);
|
||||
|
||||
@@ -272,7 +272,7 @@ public:
|
||||
const char *file,
|
||||
const char *func,
|
||||
int line,
|
||||
const std::string &message,
|
||||
const char *message,
|
||||
...
|
||||
);
|
||||
|
||||
@@ -410,7 +410,7 @@ void OutF(
|
||||
)
|
||||
{
|
||||
std::string log_str = fmt::format(fmt, args...);
|
||||
ls.Out(debug_level, log_category, file, func, line, log_str);
|
||||
ls.Out(debug_level, log_category, file, func, line, log_str.c_str());
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user