ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetic fix. Extra debug.

Browse Source
This commit is contained in:
JoelKatz
2012-04-26 18:58:31 -07:00
parent 9ae8fff660
commit 2810f887a5
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/SerializedObject.cpp
View File

@@ -134,6 +134,7 @@ STObject::STObject(SOElement* elem, SerializerIterator& sit, const char *name) :
std::string STObject::getFullText() const std::string STObject::getFullText() const
{ {
std::string ret; std::string ret;
bool first = true;
if (name != NULL) if (name != NULL)
{ {
ret = name; ret = name;
@@ -141,7 +142,11 @@ std::string STObject::getFullText() const
} }
else ret = "{"; else ret = "{";
for (boost::ptr_vector<SerializedType>::const_iterator it = mData.begin(), end = mData.end(); it != end; ++it) for (boost::ptr_vector<SerializedType>::const_iterator it = mData.begin(), end = mData.end(); it != end; ++it)
{
if (!first) ret += ", ";
else first = false;
ret += it->getFullText(); ret += it->getFullText();
}
ret += "}"; ret += "}";
return ret; return ret;
} }
@@ -375,7 +380,14 @@ uint256 STObject::getValueFieldH256(SOE_Field field) const
NewcoinAddress STObject::getValueFieldAccount(SOE_Field field) const NewcoinAddress STObject::getValueFieldAccount(SOE_Field field) const
{ {
const SerializedType* rf = peekAtPField(field); const SerializedType* rf = peekAtPField(field);
if (!rf) throw std::runtime_error("Field not found"); if (!rf)
{
#ifdef DEBUG
std::cerr << "Account field not found" << std::endl;
std::cerr << getFullText() << std::endl;
#endif
throw std::runtime_error("Field not found");
}
SerializedTypeID id = rf->getSType(); SerializedTypeID id = rf->getSType();
if (id == STI_NOTPRESENT) return NewcoinAddress(); // optional field not present if (id == STI_NOTPRESENT) return NewcoinAddress(); // optional field not present
const STAccount* cf = dynamic_cast<const STAccount *>(rf); const STAccount* cf = dynamic_cast<const STAccount *>(rf);