ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-02 01:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx++: добавление pair::invalid() и взаимодействия с std::pair<>.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2023-11-21 17:35:42 +03:00
parent 355090f02e
commit 0a58601cdf
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mdbx.h++
View File

@ -3049,15 +3049,24 @@ struct value_result {
/// \brief Combines pair of slices for key and value to represent result of /// \brief Combines pair of slices for key and value to represent result of
/// certain operations. /// certain operations.
struct pair { struct pair {
using stl_pair = std::pair<slice, slice>;
slice key, value; slice key, value;
pair(const slice &key, const slice &value) noexcept MDBX_CXX11_CONSTEXPR pair(const slice &key, const slice &value) noexcept
: key(key), value(value) {} : key(key), value(value) {}
MDBX_CXX11_CONSTEXPR pair(const stl_pair &couple) noexcept
: key(couple.first), value(couple.second) {}
MDBX_CXX11_CONSTEXPR operator stl_pair() const noexcept {
return stl_pair(key, value);
}
pair(const pair &) noexcept = default; pair(const pair &) noexcept = default;
pair &operator=(const pair &) noexcept = default; pair &operator=(const pair &) noexcept = default;
MDBX_CXX14_CONSTEXPR operator bool() const noexcept { MDBX_CXX14_CONSTEXPR operator bool() const noexcept {
assert(bool(key) == bool(value)); assert(bool(key) == bool(value));
return key; return key;
} }
MDBX_CXX14_CONSTEXPR static pair invalid() noexcept {
return pair(slice::invalid(), slice::invalid());
}
/// \brief Three-way fast non-lexicographically length-based comparison. /// \brief Three-way fast non-lexicographically length-based comparison.
MDBX_NOTHROW_PURE_FUNCTION static MDBX_CXX14_CONSTEXPR intptr_t MDBX_NOTHROW_PURE_FUNCTION static MDBX_CXX14_CONSTEXPR intptr_t
@ -3084,7 +3093,10 @@ struct pair {
/// represent result of certain operations. /// represent result of certain operations.
struct pair_result : public pair { struct pair_result : public pair {
bool done; bool done;
pair_result(const slice &key, const slice &value, bool done) noexcept MDBX_CXX11_CONSTEXPR pair_result() noexcept
: pair(pair::invalid()), done(false) {}
MDBX_CXX11_CONSTEXPR pair_result(const slice &key, const slice &value,
bool done) noexcept
: pair(key, value), done(done) {} : pair(key, value), done(done) {}
pair_result(const pair_result &) noexcept = default; pair_result(const pair_result &) noexcept = default;
pair_result &operator=(const pair_result &) noexcept = default; pair_result &operator=(const pair_result &) noexcept = default;
@ -6585,7 +6597,7 @@ inline int compare_position(const cursor &left, const cursor &right,
inline cursor::move_result::move_result(const cursor &cursor, inline cursor::move_result::move_result(const cursor &cursor,
bool throw_notfound) bool throw_notfound)
: pair_result(slice(), slice(), false) { : pair_result() {
done = cursor.move(get_current, &this->key, &this->value, throw_notfound); done = cursor.move(get_current, &this->key, &this->value, throw_notfound);
} }