mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
Suppress warnings & allow copy elision:
* Suppress warnings from rocksdb2 * Add `override` to rippled rocksdb functions * Remove moves preventing copy elision
This commit is contained in:
@@ -757,9 +757,7 @@ Ledger::peek (Keylet const& k) const
|
||||
return nullptr;
|
||||
// VFALCO TODO Eliminate "immutable" runtime property
|
||||
sle->setImmutable();
|
||||
// need move otherwise makes a copy
|
||||
// because return type is different
|
||||
return std::move(sle);
|
||||
return sle;
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@@ -196,7 +196,7 @@ public:
|
||||
}
|
||||
|
||||
std::string
|
||||
getName()
|
||||
getName() override
|
||||
{
|
||||
return m_name;
|
||||
}
|
||||
@@ -204,7 +204,7 @@ public:
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
Status
|
||||
fetch (void const* key, std::shared_ptr<NodeObject>* pObject)
|
||||
fetch (void const* key, std::shared_ptr<NodeObject>* pObject) override
|
||||
{
|
||||
pObject->reset ();
|
||||
|
||||
@@ -267,13 +267,13 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
store (std::shared_ptr<NodeObject> const& object)
|
||||
store (std::shared_ptr<NodeObject> const& object) override
|
||||
{
|
||||
m_batch.store (object);
|
||||
}
|
||||
|
||||
void
|
||||
storeBatch (Batch const& batch)
|
||||
storeBatch (Batch const& batch) override
|
||||
{
|
||||
rocksdb::WriteBatch wb;
|
||||
|
||||
@@ -299,7 +299,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
for_each (std::function <void(std::shared_ptr<NodeObject>)> f)
|
||||
for_each (std::function <void(std::shared_ptr<NodeObject>)> f) override
|
||||
{
|
||||
rocksdb::ReadOptions const options;
|
||||
|
||||
@@ -336,7 +336,7 @@ public:
|
||||
}
|
||||
|
||||
int
|
||||
getWriteLoad ()
|
||||
getWriteLoad () override
|
||||
{
|
||||
return m_batch.getWriteLoad ();
|
||||
}
|
||||
@@ -350,7 +350,7 @@ public:
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
void
|
||||
writeBatch (Batch const& batch)
|
||||
writeBatch (Batch const& batch) override
|
||||
{
|
||||
storeBatch (batch);
|
||||
}
|
||||
|
||||
@@ -179,7 +179,7 @@ public:
|
||||
}
|
||||
|
||||
std::string
|
||||
getName()
|
||||
getName() override
|
||||
{
|
||||
return m_name;
|
||||
}
|
||||
@@ -201,7 +201,7 @@ public:
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
Status
|
||||
fetch (void const* key, std::shared_ptr<NodeObject>* pObject)
|
||||
fetch (void const* key, std::shared_ptr<NodeObject>* pObject) override
|
||||
{
|
||||
pObject->reset ();
|
||||
|
||||
@@ -257,7 +257,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
store (std::shared_ptr<NodeObject> const& object)
|
||||
store (std::shared_ptr<NodeObject> const& object) override
|
||||
{
|
||||
storeBatch(Batch{object});
|
||||
}
|
||||
@@ -270,7 +270,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
storeBatch (Batch const& batch)
|
||||
storeBatch (Batch const& batch) override
|
||||
{
|
||||
rocksdb::WriteBatch wb;
|
||||
|
||||
@@ -299,7 +299,7 @@ public:
|
||||
}
|
||||
|
||||
void
|
||||
for_each (std::function <void(std::shared_ptr<NodeObject>)> f)
|
||||
for_each (std::function <void(std::shared_ptr<NodeObject>)> f) override
|
||||
{
|
||||
rocksdb::ReadOptions const options;
|
||||
|
||||
@@ -336,7 +336,7 @@ public:
|
||||
}
|
||||
|
||||
int
|
||||
getWriteLoad ()
|
||||
getWriteLoad () override
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -862,7 +862,7 @@ STParsedJSONObject::STParsedJSONObject (
|
||||
Json::Value const& json)
|
||||
{
|
||||
using namespace STParsedJSONDetail;
|
||||
object = std::move (parseObject (name, json, sfGeneric, 0, error));
|
||||
object = parseObject (name, json, sfGeneric, 0, error);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
@@ -127,7 +127,7 @@ make_stvar(Args&&... args)
|
||||
{
|
||||
STVar st;
|
||||
st.construct<T>(std::forward<Args>(args)...);
|
||||
return std::move(st);
|
||||
return st;
|
||||
}
|
||||
|
||||
inline
|
||||
|
||||
@@ -792,7 +792,7 @@ Json::Value transactionSignFor (
|
||||
{
|
||||
Json::Value err = checkMultiSignFields (jvRequest);
|
||||
if (RPC::contains_error (err))
|
||||
return std::move (err);
|
||||
return err;
|
||||
}
|
||||
|
||||
// Add and amend fields based on the transaction type.
|
||||
@@ -880,7 +880,7 @@ Json::Value transactionSubmitMultiSigned (
|
||||
{
|
||||
Json::Value err = checkMultiSignFields (jvRequest);
|
||||
if (RPC::contains_error (err))
|
||||
return std::move (err);
|
||||
return err;
|
||||
}
|
||||
|
||||
Json::Value& tx_json (jvRequest ["tx_json"]);
|
||||
@@ -913,7 +913,7 @@ Json::Value transactionSubmitMultiSigned (
|
||||
jvRequest, role, false, app.config(), app.getFeeTrack(), ledger);
|
||||
|
||||
if (RPC::contains_error(err))
|
||||
return std::move (err);
|
||||
return err;
|
||||
|
||||
err = checkPayment (
|
||||
jvRequest,
|
||||
@@ -925,7 +925,7 @@ Json::Value transactionSubmitMultiSigned (
|
||||
false);
|
||||
|
||||
if (RPC::contains_error(err))
|
||||
return std::move (err);
|
||||
return err;
|
||||
}
|
||||
|
||||
// Grind through the JSON in tx_json to produce a STTx
|
||||
|
||||
Reference in New Issue
Block a user