Merge branch 'master' into ripple

Conflicts:
	src/LedgerEntrySet.cpp
This commit is contained in:
Arthur Britto
2012-08-10 13:14:58 -07:00
37 changed files with 946 additions and 298 deletions

View File

@@ -58,6 +58,9 @@ public:
void entryDelete(SLE::pointer&, bool unfunded);
void entryModify(SLE::pointer&); // This entry will be modified
Json::Value getJson(int) const;
void addRawMeta(Serializer&);
// iterator functions
bool isEmpty() const { return mEntries.empty(); }
boost::unordered_map<uint256, LedgerEntrySetEntry>::const_iterator begin() const { return mEntries.begin(); }