Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
jed
2012-07-19 11:26:18 -07:00
2 changed files with 6 additions and 0 deletions

View File

@@ -9,6 +9,9 @@
# include <cpptl/conststring.h>
#endif
#include <cstddef> // size_t
#include <boost/lexical_cast.hpp>
#ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
# include "json_batchallocator.h"
#endif // #ifndef JSON_USE_SIMPLE_INTERNAL_ALLOCATOR
@@ -693,6 +696,7 @@ Value::asString() const
case booleanValue:
return value_.bool_ ? "true" : "false";
case intValue:
return boost::lexical_cast<std::string>(value_.int_);
case uintValue:
case realValue:
case arrayValue:

View File

@@ -97,6 +97,8 @@ public:
uint256 getClosedLedger()
{ return mLedgerMaster->getClosedLedger()->getHash(); }
// FIXME: This function is basically useless since the hash is constantly changing and the ledger
// is ephemeral and mutable.
uint256 getCurrentLedger()
{ return mLedgerMaster->getCurrentLedger()->getHash(); }