ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 19:15:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Workaround for MSVC std::function bug

Browse Source
This commit is contained in:
Vinnie Falco
2014-01-15 22:08:46 -05:00
parent ab8d7a86ae
commit 2870c7f457
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ripple_app/consensus/LedgerConsensus.cpp
View File

@@ -799,7 +799,7 @@ public:
if (acq != mAcquiring.end ()) if (acq != mAcquiring.end ())
getApp().getJobQueue().addJob(jtTXN_DATA, "peerHasTxnData", getApp().getJobQueue().addJob(jtTXN_DATA, "peerHasTxnData",
std::bind(&TransactionAcquire::peerHas, acq->second, peer)); std::bind(&TransactionAcquire::peerHasVoid, acq->second, peer));
return true; return true;
} }

10
src/ripple_app/peers/PeerSet.h
View File

@@ -67,8 +67,18 @@ public:
return mLastAction; return mLastAction;
} }
// VFALCO TODO Rename this to addPeerToSet
//
bool peerHas (Peer::ref); bool peerHas (Peer::ref);
// VFALCO Workaround for MSVC std::function which doesn't swallow return types.
void peerHasVoid (Peer::ref peer)
{
peerHas (peer);
}
void badPeer (Peer::ref); void badPeer (Peer::ref);
void setTimer (); void setTimer ();
int takePeerSetFrom (const PeerSet& s); int takePeerSetFrom (const PeerSet& s);