diff options
author | George Hazan <ghazan@miranda.im> | 2020-06-14 13:55:06 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2020-06-14 13:55:06 +0300 |
commit | 52e4ddcd83b3b64bcf97fdfcfa1120c87b7b3eb4 (patch) | |
tree | 991ccd18cf211ae6e956d9d06002e351cd7a174d /libs/libmdbx/src/test/config.cc | |
parent | 8862cf78b01bb4b9ae0da13b8e6acbf94f7c1cbe (diff) |
fixes #2450 (Update libmdbx to 0.8.1)
Diffstat (limited to 'libs/libmdbx/src/test/config.cc')
-rw-r--r-- | libs/libmdbx/src/test/config.cc | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/libs/libmdbx/src/test/config.cc b/libs/libmdbx/src/test/config.cc index f7f960c579..5e1979718a 100644 --- a/libs/libmdbx/src/test/config.cc +++ b/libs/libmdbx/src/test/config.cc @@ -395,6 +395,8 @@ void dump(const char *title) { i->params.keygen.split, i->params.keygen.width - i->params.keygen.split); log_verbose("keygen.seed: %u\n", i->params.keygen.seed); + log_verbose("keygen.zerofill: %s\n", + i->params.keygen.zero_fill ? "Yes" : "No"); log_verbose("key: minlen %u, maxlen %u\n", i->params.keylen_min, i->params.keylen_max); log_verbose("data: minlen %u, maxlen %u\n", i->params.datalen_min, @@ -450,18 +452,14 @@ using namespace config; actor_config::actor_config(actor_testcase testcase, const actor_params ¶ms, unsigned space_id, unsigned wait4id) - : params(params) { - this->space_id = space_id; - this->actor_id = 1 + (unsigned)global::actors.size(); - this->testcase = testcase; - this->wait4id = wait4id; - signal_nops = 0; -} + : actor_config_pod(1 + unsigned(global::actors.size()), testcase, space_id, + wait4id), + params(params) {} const std::string actor_config::serialize(const char *prefix) const { simple_checksum checksum; - std::string result; + if (prefix) result.append(prefix); @@ -473,13 +471,13 @@ const std::string actor_config::serialize(const char *prefix) const { result.append(params.pathname_log); result.push_back('|'); - static_assert(std::is_pod<actor_params_pod>::value, + static_assert(std::is_trivially_copyable<actor_params_pod>::value, "actor_params_pod should by POD"); result.append(data2hex(static_cast<const actor_params_pod *>(¶ms), sizeof(actor_params_pod), checksum)); result.push_back('|'); - static_assert(std::is_pod<actor_config_pod>::value, + static_assert(std::is_trivially_copyable<actor_config_pod>::value, "actor_config_pod should by POD"); result.append(data2hex(static_cast<const actor_config_pod *>(this), sizeof(actor_config_pod), checksum)); @@ -525,7 +523,7 @@ bool actor_config::deserialize(const char *str, actor_config &config) { TRACE("<< actor_config::deserialize: slash-3\n"); return false; } - static_assert(std::is_pod<actor_params_pod>::value, + static_assert(std::is_trivially_copyable<actor_params_pod>::value, "actor_params_pod should by POD"); if (!hex2data(str, slash, static_cast<actor_params_pod *>(&config.params), sizeof(actor_params_pod), checksum)) { @@ -540,7 +538,7 @@ bool actor_config::deserialize(const char *str, actor_config &config) { TRACE("<< actor_config::deserialize: slash-4\n"); return false; } - static_assert(std::is_pod<actor_config_pod>::value, + static_assert(std::is_trivially_copyable<actor_config_pod>::value, "actor_config_pod should by POD"); if (!hex2data(str, slash, static_cast<actor_config_pod *>(&config), sizeof(actor_config_pod), checksum)) { |