lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +03:00
Code Activity

Rename reported log_msg struct to log_msg_t

Browse Source 
MySQL defines a macro log_msg in one of its headers, which
causes log_msg to be replaced with different symbol in
some compilation units.

Fix by renaming the struct to log_msg_t to avoid the conflict.
This commit is contained in:
Teemu Ollakka
2024-03-19 10:20:29 +02:00
parent 6a17207b7f
commit 7d108eb870
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wsrep/reporter.hpp
View File

@ -105,21 +105,21 @@ namespace wsrep
typedef struct {
double tstamp;
std::string msg;
} log_msg;
} log_msg_t ;
std::deque<log_msg> err_msg_;
std::deque<log_msg> warn_msg_;
std::deque<log_msg> events_;
std::deque<log_msg_t> err_msg_;
std::deque<log_msg_t> warn_msg_;
std::deque<log_msg_t> events_;
size_t const max_msg_;
static void write_log_msg(std::ostream& os,
const log_msg& msg);
const log_msg_t& msg);
static void write_event(std::ostream& os,
const log_msg& msg);
const log_msg_t& msg);
static void write_array(std::ostream& os, const std::string& label,
const std::deque<log_msg>& events,
const std::deque<log_msg_t>& events,
void (*element_writer)(std::ostream& os,
const log_msg& msg));
const log_msg_t& msg));
substates substate_map(enum server_state::state state);
float progress_map(float progress) const;
void write_file(double timestamp);