mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-12 11:19:08 -05:00
scripted-diff: rename BytePtr to AsBytePtr
Building with iPhoneOS SDK fails because it also has `BytePtr` defined in /usr/include/MacTypes.h. -BEGIN VERIFY SCRIPT- sed -i 's/BytePtr/AsBytePtr/' $(git grep -l "BytePtr" src) -END VERIFY SCRIPT-
This commit is contained in:
parent
a19f641a80
commit
bae4561938
4 changed files with 14 additions and 14 deletions
|
@ -472,10 +472,10 @@ struct CustomUintFormatter
|
||||||
if (v < 0 || v > MAX) throw std::ios_base::failure("CustomUintFormatter value out of range");
|
if (v < 0 || v > MAX) throw std::ios_base::failure("CustomUintFormatter value out of range");
|
||||||
if (BigEndian) {
|
if (BigEndian) {
|
||||||
uint64_t raw = htobe64(v);
|
uint64_t raw = htobe64(v);
|
||||||
s.write({BytePtr(&raw) + 8 - Bytes, Bytes});
|
s.write({AsBytePtr(&raw) + 8 - Bytes, Bytes});
|
||||||
} else {
|
} else {
|
||||||
uint64_t raw = htole64(v);
|
uint64_t raw = htole64(v);
|
||||||
s.write({BytePtr(&raw), Bytes});
|
s.write({AsBytePtr(&raw), Bytes});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -485,10 +485,10 @@ struct CustomUintFormatter
|
||||||
static_assert(std::numeric_limits<U>::max() >= MAX && std::numeric_limits<U>::min() <= 0, "Assigned type too small");
|
static_assert(std::numeric_limits<U>::max() >= MAX && std::numeric_limits<U>::min() <= 0, "Assigned type too small");
|
||||||
uint64_t raw = 0;
|
uint64_t raw = 0;
|
||||||
if (BigEndian) {
|
if (BigEndian) {
|
||||||
s.read({BytePtr(&raw) + 8 - Bytes, Bytes});
|
s.read({AsBytePtr(&raw) + 8 - Bytes, Bytes});
|
||||||
v = static_cast<I>(be64toh(raw));
|
v = static_cast<I>(be64toh(raw));
|
||||||
} else {
|
} else {
|
||||||
s.read({BytePtr(&raw), Bytes});
|
s.read({AsBytePtr(&raw), Bytes});
|
||||||
v = static_cast<I>(le64toh(raw));
|
v = static_cast<I>(le64toh(raw));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -245,19 +245,19 @@ T& SpanPopBack(Span<T>& span)
|
||||||
|
|
||||||
//! Convert a data pointer to a std::byte data pointer.
|
//! Convert a data pointer to a std::byte data pointer.
|
||||||
//! Where possible, please use the safer AsBytes helpers.
|
//! Where possible, please use the safer AsBytes helpers.
|
||||||
inline const std::byte* BytePtr(const void* data) { return reinterpret_cast<const std::byte*>(data); }
|
inline const std::byte* AsBytePtr(const void* data) { return reinterpret_cast<const std::byte*>(data); }
|
||||||
inline std::byte* BytePtr(void* data) { return reinterpret_cast<std::byte*>(data); }
|
inline std::byte* AsBytePtr(void* data) { return reinterpret_cast<std::byte*>(data); }
|
||||||
|
|
||||||
// From C++20 as_bytes and as_writeable_bytes
|
// From C++20 as_bytes and as_writeable_bytes
|
||||||
template <typename T>
|
template <typename T>
|
||||||
Span<const std::byte> AsBytes(Span<T> s) noexcept
|
Span<const std::byte> AsBytes(Span<T> s) noexcept
|
||||||
{
|
{
|
||||||
return {BytePtr(s.data()), s.size_bytes()};
|
return {AsBytePtr(s.data()), s.size_bytes()};
|
||||||
}
|
}
|
||||||
template <typename T>
|
template <typename T>
|
||||||
Span<std::byte> AsWritableBytes(Span<T> s) noexcept
|
Span<std::byte> AsWritableBytes(Span<T> s) noexcept
|
||||||
{
|
{
|
||||||
return {BytePtr(s.data()), s.size_bytes()};
|
return {AsBytePtr(s.data()), s.size_bytes()};
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename V>
|
template <typename V>
|
||||||
|
|
|
@ -683,10 +683,10 @@ bool BerkeleyBatch::ReadAtCursor(CDataStream& ssKey, CDataStream& ssValue, bool&
|
||||||
// Convert to streams
|
// Convert to streams
|
||||||
ssKey.SetType(SER_DISK);
|
ssKey.SetType(SER_DISK);
|
||||||
ssKey.clear();
|
ssKey.clear();
|
||||||
ssKey.write({BytePtr(datKey.get_data()), datKey.get_size()});
|
ssKey.write({AsBytePtr(datKey.get_data()), datKey.get_size()});
|
||||||
ssValue.SetType(SER_DISK);
|
ssValue.SetType(SER_DISK);
|
||||||
ssValue.clear();
|
ssValue.clear();
|
||||||
ssValue.write({BytePtr(datValue.get_data()), datValue.get_size()});
|
ssValue.write({AsBytePtr(datValue.get_data()), datValue.get_size()});
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -758,7 +758,7 @@ bool BerkeleyBatch::ReadKey(CDataStream&& key, CDataStream& value)
|
||||||
SafeDbt datValue;
|
SafeDbt datValue;
|
||||||
int ret = pdb->get(activeTxn, datKey, datValue, 0);
|
int ret = pdb->get(activeTxn, datKey, datValue, 0);
|
||||||
if (ret == 0 && datValue.get_data() != nullptr) {
|
if (ret == 0 && datValue.get_data() != nullptr) {
|
||||||
value.write({BytePtr(datValue.get_data()), datValue.get_size()});
|
value.write({AsBytePtr(datValue.get_data()), datValue.get_size()});
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -405,7 +405,7 @@ bool SQLiteBatch::ReadKey(CDataStream&& key, CDataStream& value)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// Leftmost column in result is index 0
|
// Leftmost column in result is index 0
|
||||||
const std::byte* data{BytePtr(sqlite3_column_blob(m_read_stmt, 0))};
|
const std::byte* data{AsBytePtr(sqlite3_column_blob(m_read_stmt, 0))};
|
||||||
size_t data_size(sqlite3_column_bytes(m_read_stmt, 0));
|
size_t data_size(sqlite3_column_bytes(m_read_stmt, 0));
|
||||||
value.write({data, data_size});
|
value.write({data, data_size});
|
||||||
|
|
||||||
|
@ -497,10 +497,10 @@ bool SQLiteBatch::ReadAtCursor(CDataStream& key, CDataStream& value, bool& compl
|
||||||
}
|
}
|
||||||
|
|
||||||
// Leftmost column in result is index 0
|
// Leftmost column in result is index 0
|
||||||
const std::byte* key_data{BytePtr(sqlite3_column_blob(m_cursor_stmt, 0))};
|
const std::byte* key_data{AsBytePtr(sqlite3_column_blob(m_cursor_stmt, 0))};
|
||||||
size_t key_data_size(sqlite3_column_bytes(m_cursor_stmt, 0));
|
size_t key_data_size(sqlite3_column_bytes(m_cursor_stmt, 0));
|
||||||
key.write({key_data, key_data_size});
|
key.write({key_data, key_data_size});
|
||||||
const std::byte* value_data{BytePtr(sqlite3_column_blob(m_cursor_stmt, 1))};
|
const std::byte* value_data{AsBytePtr(sqlite3_column_blob(m_cursor_stmt, 1))};
|
||||||
size_t value_data_size(sqlite3_column_bytes(m_cursor_stmt, 1));
|
size_t value_data_size(sqlite3_column_bytes(m_cursor_stmt, 1));
|
||||||
value.write({value_data, value_data_size});
|
value.write({value_data, value_data_size});
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Add table
Reference in a new issue