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

Fix compiler warnings.

Browse Source
This commit is contained in:
Arthur Britto
2012-08-23 22:31:14 -07:00
parent 0f51eb8ccf
commit e6511732c7
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Pathfinder.cpp
View File

@@ -77,7 +77,7 @@ PathOption::PathOption(PathOption::pointer other)
Pathfinder::Pathfinder(NewcoinAddress& srcAccountID, NewcoinAddress& dstAccountID, uint160& srcCurrencyID, STAmount dstAmount) : Pathfinder::Pathfinder(NewcoinAddress& srcAccountID, NewcoinAddress& dstAccountID, uint160& srcCurrencyID, STAmount dstAmount) :
mSrcAccountID(srcAccountID.getAccountID()) , mDstAccountID(dstAccountID.getAccountID()), mSrcCurrencyID(srcCurrencyID) , mDstAmount(dstAmount), mOrderBook(theApp->getMasterLedger().getCurrentLedger()) mSrcAccountID(srcAccountID.getAccountID()), mDstAccountID(dstAccountID.getAccountID()), mDstAmount(dstAmount), mSrcCurrencyID(srcCurrencyID), mOrderBook(theApp->getMasterLedger().getCurrentLedger())
{ {
mLedger=theApp->getMasterLedger().getCurrentLedger(); mLedger=theApp->getMasterLedger().getCurrentLedger();
} }
@@ -99,7 +99,6 @@ bool Pathfinder::findPaths(int maxSearchSteps, int maxPay, STPathSet& retPathSet
} }
if(checkComplete(retPathSet)) return(true); if(checkComplete(retPathSet)) return(true);
} }
} }
return(false); return(false);
@@ -192,11 +191,11 @@ void Pathfinder::addPathOption(PathOption::pointer pathOption)
{ // this path is complete { // this path is complete
mCompletePaths.push_back(pathOption); mCompletePaths.push_back(pathOption);
}else mBuildingPaths.push_back(pathOption); }else mBuildingPaths.push_back(pathOption);
}else }
else
{ {
pathOption->mCorrectCurrency=false; pathOption->mCorrectCurrency=false;
mBuildingPaths.push_back(pathOption); mBuildingPaths.push_back(pathOption);
} }
} }
// vim:ts=4

2
src/Pathfinder.h
View File

@@ -33,7 +33,6 @@ class Pathfinder
OrderBookDB mOrderBook; OrderBookDB mOrderBook;
Ledger::pointer mLedger; Ledger::pointer mLedger;
std::list<PathOption::pointer> mBuildingPaths; std::list<PathOption::pointer> mBuildingPaths;
std::list<PathOption::pointer> mCompletePaths; std::list<PathOption::pointer> mCompletePaths;
@@ -50,3 +49,4 @@ public:
// returns false if there is no path. otherwise fills out retPath // returns false if there is no path. otherwise fills out retPath
bool findPaths(int maxSearchSteps, int maxPay, STPathSet& retPathSet); bool findPaths(int maxSearchSteps, int maxPay, STPathSet& retPathSet);
}; };
// vim:ts=4

4
src/TransactionEngine.cpp
View File

@@ -2618,8 +2618,8 @@ bool TransactionEngine::calcNodeAccountRev(unsigned int uIndex, PathState::point
const uint160& uCurrencyID = pnCur.uCurrencyID; const uint160& uCurrencyID = pnCur.uCurrencyID;
const uint32 uQualityIn = uIndex ? rippleQualityIn(uCurAccountID, uPrvAccountID, uCurrencyID) : 1; const uint32 uQualityIn = uIndex ? rippleQualityIn(uCurAccountID, uPrvAccountID, uCurrencyID) : QUALITY_ONE;
const uint32 uQualityOut = uIndex != uLast ? rippleQualityOut(uCurAccountID, uNxtAccountID, uCurrencyID) : 1; const uint32 uQualityOut = uIndex != uLast ? rippleQualityOut(uCurAccountID, uNxtAccountID, uCurrencyID) : QUALITY_ONE;
// For bPrvAccount // For bPrvAccount
const STAmount saPrvBalance = uIndex && bPrvAccount ? rippleBalance(uCurAccountID, uPrvAccountID, uCurrencyID) : STAmount(uCurrencyID); const STAmount saPrvBalance = uIndex && bPrvAccount ? rippleBalance(uCurAccountID, uPrvAccountID, uCurrencyID) : STAmount(uCurrencyID);