ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some cleanups that should make Arthur happy.

Browse Source
This commit is contained in:
JoelKatz
2012-08-28 16:07:44 -07:00
parent 192c64461d
commit e4f7ffe995
7 changed files with 73 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/SerializedObject.cpp
View File

@@ -185,15 +185,13 @@ std::string STObject::getFullText() const
}
else ret = "{";
for (boost::ptr_vector<SerializedType>::const_iterator it = mData.begin(), end = mData.end(); it != end; ++it)
{
if (it->getSType() != STI_NOTPRESENT)
BOOST_FOREACH(const SerializedType& it, mData)
if (it.getSType() != STI_NOTPRESENT)
{
if (!first) ret += ", ";
else first = false;
ret += it->getFullText();
ret += it.getFullText();
}
}
ret += "}";
return ret;
@@ -202,29 +200,29 @@ std::string STObject::getFullText() const
int STObject::getLength() const
{
int ret = 0;
for (boost::ptr_vector<SerializedType>::const_iterator it = mData.begin(), end = mData.end(); it != end; ++it)
ret += it->getLength();
BOOST_FOREACH(const SerializedType& it, mData)
ret += it.getLength();
return ret;
}
void STObject::add(Serializer& s) const
{
for (boost::ptr_vector<SerializedType>::const_iterator it = mData.begin(), end = mData.end(); it != end; ++it)
it->add(s);
BOOST_FOREACH(const SerializedType& it, mData)
it.add(s);
}
std::string STObject::getText() const
{
std::string ret = "{";
bool first = false;
for (boost::ptr_vector<SerializedType>::const_iterator it = mData.begin(), end = mData.end(); it != end; ++it)
BOOST_FOREACH(const SerializedType& it, mData)
{
if (!first)
{
ret += ", ";
first = false;
}
ret += it->getText();
ret += it.getText();
}
ret += "}";
return ret;
@@ -654,14 +652,13 @@ Json::Value STObject::getJson(int options) const
{
Json::Value ret(Json::objectValue);
int index = 1;
for(boost::ptr_vector<SerializedType>::const_iterator it = mData.begin(), end = mData.end(); it != end;
++it, ++index)
BOOST_FOREACH(const SerializedType& it, mData)
{
if (it->getSType() != STI_NOTPRESENT)
if (it.getSType() != STI_NOTPRESENT)
{
if (it->getName() == NULL)
ret[boost::lexical_cast<std::string>(index)] = it->getJson(options);
else ret[it->getName()] = it->getJson(options);
if (it.getName() == NULL)
ret[boost::lexical_cast<std::string>(index)] = it.getJson(options);
else ret[it.getName()] = it.getJson(options);
}
}
return ret;
@@ -672,9 +669,7 @@ Json::Value STVector256::getJson(int options) const
Json::Value ret(Json::arrayValue);
BOOST_FOREACH(std::vector<uint256>::const_iterator::value_type vEntry, mValue)
{
ret.append(vEntry.ToString());
}
return ret;
}