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

Fixed compilation errors picked up by travis clang builds

Browse Source
This commit is contained in:
Teemu Ollakka
2019-01-19 18:08:49 +02:00
parent 869a706fa1
commit ae734a33f8
11 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbsim/db_client_service.hpp
View File

@ -60,7 +60,7 @@ namespace db
enum wsrep::provider::status replay()
override;
void emergency_shutdown() { ::abort(); }
void emergency_shutdown() override { ::abort(); }
void debug_sync(const char*) override { }
void debug_crash(const char*) override { }
private:

2
dbsim/db_server.cpp
View File

@ -33,7 +33,7 @@ db::server::server(simulator& simulator,
, mutex_()
, cond_()
, server_service_(*this)
, server_state_(*this, server_service_,
, server_state_(server_service_,
name, address, "dbsim_" + name + "_data")
, last_client_id_(0)
, last_transaction_id_(0)

2
dbsim/db_server_service.hpp
View File

@ -43,7 +43,7 @@ namespace db
std::string sst_request() override;
void background_rollback(wsrep::client_state&) override;
void bootstrap() override;
void log_message(enum wsrep::log::level, const char* message);
void log_message(enum wsrep::log::level, const char* message) override;
void log_dummy_write_set(wsrep::client_state&, const wsrep::ws_meta&)
override;
void log_view(wsrep::high_priority_service*,

5
dbsim/db_server_state.hpp
View File

@ -32,8 +32,7 @@ namespace db
class server_state : public wsrep::server_state
{
public:
server_state(db::server& server,
wsrep::server_service& server_service,
server_state(wsrep::server_service& server_service,
const std::string& name,
const std::string& address,
const std::string& working_dir)
@ -50,12 +49,10 @@ namespace db
wsrep::server_state::rm_async)
, mutex_()
, cond_()
, server_(server)
{ }
private:
wsrep::default_mutex mutex_;
wsrep::default_condition_variable cond_;
db::server& server_;
};
}