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

Fix shadowing

Browse Source
This commit is contained in:
Edward Hennis
2015-06-24 16:55:31 -04:00
committed by Vinnie Falco
parent 4c0de726c8
commit 89b9fa0b35
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ripple/app/misc/NetworkOPs.cpp
View File

@@ -275,7 +275,7 @@ public:
* *
* @param Lock that protects the transaction batching * @param Lock that protects the transaction batching
*/ */
void apply (std::unique_lock<std::mutex>& lock); void apply (std::unique_lock<std::mutex>& batchLock);
/** /**
* Apply each transaction to open ledger. * Apply each transaction to open ledger.
@@ -1089,7 +1089,7 @@ void NetworkOPsImp::transactionBatch()
} }
} }
void NetworkOPsImp::apply (std::unique_lock<std::mutex>& lock) void NetworkOPsImp::apply (std::unique_lock<std::mutex>& batchLock)
{ {
std::vector<TransactionStatus> transactions; std::vector<TransactionStatus> transactions;
mTransactions.swap (transactions); mTransactions.swap (transactions);
@@ -1098,7 +1098,7 @@ void NetworkOPsImp::apply (std::unique_lock<std::mutex>& lock)
assert (mDispatchState != DispatchState::running); assert (mDispatchState != DispatchState::running);
mDispatchState = DispatchState::running; mDispatchState = DispatchState::running;
lock.unlock(); batchLock.unlock();
Ledger::pointer ledger; Ledger::pointer ledger;
TransactionEngine engine; TransactionEngine engine;
@@ -1203,7 +1203,7 @@ void NetworkOPsImp::apply (std::unique_lock<std::mutex>& lock)
} }
} }
lock.lock(); batchLock.lock();
for (TransactionStatus& e : transactions) for (TransactionStatus& e : transactions)
e.transaction->clearApplying(); e.transaction->clearApplying();