mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-28 15:05:53 +00:00
Fix base_uint ctor to disambiguate void const*
This commit is contained in:
@@ -176,7 +176,7 @@ public:
|
||||
else
|
||||
{
|
||||
// Uh oh, corrupted data!
|
||||
WriteLog (lsFATAL, NodeObject) << "Corrupt NodeObject #" << uint256 (it->key ().data ());
|
||||
WriteLog (lsFATAL, NodeObject) << "Corrupt NodeObject #" << uint256::fromVoid (it->key ().data ());
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
@@ -28,7 +28,7 @@ public:
|
||||
|
||||
Status fetch (void const* key, NodeObject::Ptr* pObject)
|
||||
{
|
||||
uint256 const hash (key);
|
||||
uint256 const hash (uint256::fromVoid (key));
|
||||
|
||||
Map::iterator iter = m_map.find (hash);
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ NodeObject::Ptr NodeStore::DecodedBlob::createObject ()
|
||||
memcpy (data.data (), m_objectData, m_dataBytes);
|
||||
|
||||
object = NodeObject::createObject (
|
||||
m_objectType, m_ledgerIndex, data, uint256 (m_key));
|
||||
m_objectType, m_ledgerIndex, data, uint256::fromVoid (m_key));
|
||||
}
|
||||
|
||||
return object;
|
||||
|
||||
@@ -66,7 +66,7 @@ public:
|
||||
{
|
||||
ScopedLock sl (m_db->getDBLock());
|
||||
|
||||
uint256 const hash (key);
|
||||
uint256 const hash (uint256::fromVoid (key));
|
||||
|
||||
static SqliteStatement pSt (m_db->getDB()->getSqliteDB(),
|
||||
"SELECT ObjType,LedgerIndex,Object FROM CommittedObjects WHERE Hash = ?;");
|
||||
|
||||
Reference in New Issue
Block a user