ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-29 23:19:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx++: переименование slice::as_intXX() в slice::as_intXX_adapt() и добавление slice::as_intXX().

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2023-11-17 23:55:37 +03:00
parent 6facd20b2b
commit d6a79a9c5f
2 changed files with 84 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
mdbx.h++
View File

@ -1058,20 +1058,40 @@ struct LIBMDBX_API_TYPE slice : public ::MDBX_val {
} }
#ifdef MDBX_U128_TYPE #ifdef MDBX_U128_TYPE
MDBX_U128_TYPE as_uint128() const; MDBX_CXX14_CONSTEXPR MDBX_U128_TYPE as_uint128() const {
return as_pod<MDBX_U128_TYPE>();
}
#endif /* MDBX_U128_TYPE */ #endif /* MDBX_U128_TYPE */
uint64_t as_uint64() const; MDBX_CXX14_CONSTEXPR uint64_t as_uint64() const { return as_pod<uint64_t>(); }
uint32_t as_uint32() const; MDBX_CXX14_CONSTEXPR uint32_t as_uint32() const { return as_pod<uint32_t>(); }
uint16_t as_uint16() const; MDBX_CXX14_CONSTEXPR uint16_t as_uint16() const { return as_pod<uint16_t>(); }
uint8_t as_uint8() const; MDBX_CXX14_CONSTEXPR uint8_t as_uint8() const { return as_pod<uint8_t>(); }
#ifdef MDBX_I128_TYPE #ifdef MDBX_I128_TYPE
MDBX_I128_TYPE as_int128() const; MDBX_CXX14_CONSTEXPR MDBX_I128_TYPE as_int128() const {
return as_pod<MDBX_I128_TYPE>();
}
#endif /* MDBX_I128_TYPE */ #endif /* MDBX_I128_TYPE */
int64_t as_int64() const; MDBX_CXX14_CONSTEXPR int64_t as_int64() const { return as_pod<int64_t>(); }
int32_t as_int32() const; MDBX_CXX14_CONSTEXPR int32_t as_int32() const { return as_pod<int32_t>(); }
int16_t as_int16() const; MDBX_CXX14_CONSTEXPR int16_t as_int16() const { return as_pod<int16_t>(); }
int8_t as_int8() const; MDBX_CXX14_CONSTEXPR int8_t as_int8() const { return as_pod<int8_t>(); }
#ifdef MDBX_U128_TYPE
MDBX_U128_TYPE as_uint128_adapt() const;
#endif /* MDBX_U128_TYPE */
uint64_t as_uint64_adapt() const;
uint32_t as_uint32_adapt() const;
uint16_t as_uint16_adapt() const;
uint8_t as_uint8_adapt() const;
#ifdef MDBX_I128_TYPE
MDBX_I128_TYPE as_int128_adapt() const;
#endif /* MDBX_I128_TYPE */
int64_t as_int64_adapt() const;
int32_t as_int32_adapt() const;
int16_t as_int16_adapt() const;
int8_t as_int8_adapt() const;
protected: protected:
MDBX_CXX11_CONSTEXPR slice(size_t invalid_length) noexcept MDBX_CXX11_CONSTEXPR slice(size_t invalid_length) noexcept
@ -2341,20 +2361,46 @@ public:
} }
#ifdef MDBX_U128_TYPE #ifdef MDBX_U128_TYPE
MDBX_U128_TYPE as_uint128() const { return slice().as_uint128(); } MDBX_CXX14_CONSTEXPR MDBX_U128_TYPE as_uint128() const {
return slice().as_uint128();
}
#endif /* MDBX_U128_TYPE */ #endif /* MDBX_U128_TYPE */
uint64_t as_uint64() const { return slice().as_uint64(); } MDBX_CXX14_CONSTEXPR uint64_t as_uint64() const {
uint32_t as_uint32() const { return slice().as_uint32(); } return slice().as_uint64();
uint16_t as_uint16() const { return slice().as_uint16(); } }
uint8_t as_uint8() const { return slice().as_uint8(); } MDBX_CXX14_CONSTEXPR uint32_t as_uint32() const {
return slice().as_uint32();
}
MDBX_CXX14_CONSTEXPR uint16_t as_uint16() const {
return slice().as_uint16();
}
MDBX_CXX14_CONSTEXPR uint8_t as_uint8() const { return slice().as_uint8(); }
#ifdef MDBX_I128_TYPE #ifdef MDBX_I128_TYPE
MDBX_I128_TYPE as_int128() const { return slice().as_int128(); } MDBX_CXX14_CONSTEXPR MDBX_I128_TYPE as_int128() const {
return slice().as_int128();
}
#endif /* MDBX_I128_TYPE */ #endif /* MDBX_I128_TYPE */
int64_t as_int64() const { return slice().as_int64(); } MDBX_CXX14_CONSTEXPR int64_t as_int64() const { return slice().as_int64(); }
int32_t as_int32() const { return slice().as_int32(); } MDBX_CXX14_CONSTEXPR int32_t as_int32() const { return slice().as_int32(); }
int16_t as_int16() const { return slice().as_int16(); } MDBX_CXX14_CONSTEXPR int16_t as_int16() const { return slice().as_int16(); }
int8_t as_int8() const { return slice().as_int8(); } MDBX_CXX14_CONSTEXPR int8_t as_int8() const { return slice().as_int8(); }
#ifdef MDBX_U128_TYPE
MDBX_U128_TYPE as_uint128_adapt() const { return slice().as_uint128_adapt(); }
#endif /* MDBX_U128_TYPE */
uint64_t as_uint64_adapt() const { return slice().as_uint64_adapt(); }
uint32_t as_uint32_adapt() const { return slice().as_uint32_adapt(); }
uint16_t as_uint16_adapt() const { return slice().as_uint16_adapt(); }
uint8_t as_uint8_adapt() const { return slice().as_uint8_adapt(); }
#ifdef MDBX_I128_TYPE
MDBX_I128_TYPE as_int128_adapt() const { return slice().as_int128_adapt(); }
#endif /* MDBX_I128_TYPE */
int64_t as_int64_adapt() const { return slice().as_int64_adapt(); }
int32_t as_int32_adapt() const { return slice().as_int32_adapt(); }
int16_t as_int16_adapt() const { return slice().as_int16_adapt(); }
int8_t as_int8_adapt() const { return slice().as_int8_adapt(); }
/// \brief Returns a new buffer with a hexadecimal dump of the slice content. /// \brief Returns a new buffer with a hexadecimal dump of the slice content.
static buffer hex(const ::mdbx::slice &source, bool uppercase = false, static buffer hex(const ::mdbx::slice &source, bool uppercase = false,

36
src/mdbx.c++
View File

@ -492,48 +492,48 @@ bool slice::is_printable(bool disable_utf8) const noexcept {
} }
#ifdef MDBX_U128_TYPE #ifdef MDBX_U128_TYPE
MDBX_U128_TYPE slice::as_uint128() const { MDBX_U128_TYPE slice::as_uint128_adapt() const {
static_assert(sizeof(MDBX_U128_TYPE) == 16, "WTF?"); static_assert(sizeof(MDBX_U128_TYPE) == 16, "WTF?");
if (size() == 16) { if (size() == 16) {
MDBX_U128_TYPE r; MDBX_U128_TYPE r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_uint64(); return as_uint64_adapt();
} }
#endif /* MDBX_U128_TYPE */ #endif /* MDBX_U128_TYPE */
uint64_t slice::as_uint64() const { uint64_t slice::as_uint64_adapt() const {
static_assert(sizeof(uint64_t) == 8, "WTF?"); static_assert(sizeof(uint64_t) == 8, "WTF?");
if (size() == 8) { if (size() == 8) {
uint64_t r; uint64_t r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_uint32(); return as_uint32_adapt();
} }
uint32_t slice::as_uint32() const { uint32_t slice::as_uint32_adapt() const {
static_assert(sizeof(uint32_t) == 4, "WTF?"); static_assert(sizeof(uint32_t) == 4, "WTF?");
if (size() == 4) { if (size() == 4) {
uint32_t r; uint32_t r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_uint16(); return as_uint16_adapt();
} }
uint16_t slice::as_uint16() const { uint16_t slice::as_uint16_adapt() const {
static_assert(sizeof(uint16_t) == 2, "WTF?"); static_assert(sizeof(uint16_t) == 2, "WTF?");
if (size() == 2) { if (size() == 2) {
uint16_t r; uint16_t r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_uint8(); return as_uint8_adapt();
} }
uint8_t slice::as_uint8() const { uint8_t slice::as_uint8_adapt() const {
static_assert(sizeof(uint8_t) == 1, "WTF?"); static_assert(sizeof(uint8_t) == 1, "WTF?");
if (size() == 1) if (size() == 1)
return *static_cast<const uint8_t *>(data()); return *static_cast<const uint8_t *>(data());
@ -544,48 +544,48 @@ uint8_t slice::as_uint8() const {
} }
#ifdef MDBX_I128_TYPE #ifdef MDBX_I128_TYPE
MDBX_I128_TYPE slice::as_int128() const { MDBX_I128_TYPE slice::as_int128_adapt() const {
static_assert(sizeof(MDBX_I128_TYPE) == 16, "WTF?"); static_assert(sizeof(MDBX_I128_TYPE) == 16, "WTF?");
if (size() == 16) { if (size() == 16) {
MDBX_I128_TYPE r; MDBX_I128_TYPE r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_int64(); return as_int64_adapt();
} }
#endif /* MDBX_I128_TYPE */ #endif /* MDBX_I128_TYPE */
int64_t slice::as_int64() const { int64_t slice::as_int64_adapt() const {
static_assert(sizeof(int64_t) == 8, "WTF?"); static_assert(sizeof(int64_t) == 8, "WTF?");
if (size() == 8) { if (size() == 8) {
uint64_t r; uint64_t r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_int32(); return as_int32_adapt();
} }
int32_t slice::as_int32() const { int32_t slice::as_int32_adapt() const {
static_assert(sizeof(int32_t) == 4, "WTF?"); static_assert(sizeof(int32_t) == 4, "WTF?");
if (size() == 4) { if (size() == 4) {
int32_t r; int32_t r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_int16(); return as_int16_adapt();
} }
int16_t slice::as_int16() const { int16_t slice::as_int16_adapt() const {
static_assert(sizeof(int16_t) == 2, "WTF?"); static_assert(sizeof(int16_t) == 2, "WTF?");
if (size() == 2) { if (size() == 2) {
int16_t r; int16_t r;
memcpy(&r, data(), sizeof(r)); memcpy(&r, data(), sizeof(r));
return r; return r;
} else } else
return as_int8(); return as_int8_adapt();
} }
int8_t slice::as_int8() const { int8_t slice::as_int8_adapt() const {
if (size() == 1) if (size() == 1)
return *static_cast<const int8_t *>(data()); return *static_cast<const int8_t *>(data());
else if (size() == 0) else if (size() == 0)