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

Merge branch 'pay'

Browse Source 
Conflicts:
	src/LedgerMaster.h
This commit is contained in:
Arthur Britto
2012-05-31 01:54:44 -07:00
parent 24e60f5e48 dad9568f4f
commit 6cb234ef82
11 changed files with 186 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/SerializedTypes.h
View File

@@ -330,7 +330,7 @@ public:
friend STAmount convertToInternalAmount(uint64 displayAmount, uint64 totalNow, uint64 totalInit,
const char* name = NULL);
static STAmount deSerialize(SerializerIterator&);
static STAmount deserialize(SerializerIterator&);
static bool currencyFromString(uint160& uDstCurrency, const std::string& sCurrency);
};