mirror of
https://github.com/XRPLF/rippled.git
synced 2025-12-06 17:27:55 +00:00
Tidy up the structure of sources in protocol/:
Split out and rename STValidation Split out and rename STBlob Split out and rename STAccount Split out STPathSet Split STVector256 and move UintTypes to protocol/ Rename to STBase Rename to STLedgerEntry Rename to SOTemplate Rename to STTx Remove obsolete AgedHistory Remove types.h and add missing includes Remove unnecessary includes in app.h Remove unnecessary includes in app.h Remove include app.h from app1.cpp
This commit is contained in:
committed by
Nik Bougalis
parent
31110c7fd9
commit
08a81a0ab9
@@ -128,14 +128,14 @@ static Json::Value singleton_expected (std::string const& object,
|
||||
|
||||
// This function is used by parseObject to parse any JSON type that doesn't
|
||||
// recurse. Everything represented here is a leaf-type.
|
||||
static std::unique_ptr <SerializedType> parseLeaf (
|
||||
static std::unique_ptr <STBase> parseLeaf (
|
||||
std::string const& json_name,
|
||||
std::string const& fieldName,
|
||||
SField::ptr name,
|
||||
Json::Value const& value,
|
||||
Json::Value& error)
|
||||
{
|
||||
std::unique_ptr <SerializedType> ret;
|
||||
std::unique_ptr <STBase> ret;
|
||||
|
||||
SField::ref field = SField::getField (fieldName);
|
||||
|
||||
@@ -406,7 +406,7 @@ static std::unique_ptr <SerializedType> parseLeaf (
|
||||
if (!vBlob.second)
|
||||
throw std::invalid_argument ("invalid data");
|
||||
|
||||
ret = std::make_unique <STVariableLength> (field, vBlob.first);
|
||||
ret = std::make_unique <STBlob> (field, vBlob.first);
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
@@ -680,7 +680,7 @@ static bool parseObject (
|
||||
|
||||
SField::ptr name (&inName);
|
||||
|
||||
boost::ptr_vector<SerializedType> data;
|
||||
boost::ptr_vector<STBase> data;
|
||||
Json::Value::Members members (json.getMemberNames ());
|
||||
|
||||
for (Json::Value::Members::iterator it (members.begin ());
|
||||
@@ -750,7 +750,7 @@ static bool parseObject (
|
||||
// Everything else (types that don't recurse).
|
||||
default:
|
||||
{
|
||||
std::unique_ptr <SerializedType> serTyp =
|
||||
std::unique_ptr <STBase> serTyp =
|
||||
parseLeaf (json_name, fieldName, name, value, error);
|
||||
|
||||
if (!serTyp)
|
||||
|
||||
Reference in New Issue
Block a user