diff options
| author | MarcoFalke <[email protected]> | 2018-12-29 14:13:54 +0100 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2018-12-29 14:14:26 +0100 |
| commit | cbb91cd0ec8e858b986776723ed4dc25df4b74ee (patch) | |
| tree | b85e9851d51a56aff25fb3edc19d430eac95287e /src/validation.cpp | |
| parent | Merge #14966: docs: fix testmempoolaccept CLI syntax (diff) | |
| parent | scripted-diff: Replace boost::bind with std::bind (diff) | |
| download | discoin-cbb91cd0ec8e858b986776723ed4dc25df4b74ee.tar.xz discoin-cbb91cd0ec8e858b986776723ed4dc25df4b74ee.zip | |
Merge #13743: refactor: Replace boost::bind with std::bind
cb53b825c2 scripted-diff: Replace boost::bind with std::bind (Chun Kuan Lee)
2196c51821 refactor: Use boost::scoped_connection in signal/slot, also prefer range-based loop instead of std::transform (Chun Kuan Lee)
Pull request description:
Replace boost::bind with std::bind
- In `src/rpc/server.cpp`, replace `std::transform` with simple loop.
- In `src/validation.cpp`, store the `boost::signals2::connection` object and use it to disconnect.
- In `src/validationinterface.cpp`, use 2 map to store the `boost::signals2::scoped_connection` object.
Tree-SHA512: 6653cbe00036fecfc495340618efcba6d7be0227c752b37b81a27184433330f817e8de9257774e9b35828026cb55f11ee7f17d6c388aebe22c4a3df13b5092f0
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index f0c4aba95..00d7a60cb 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2366,14 +2366,11 @@ class ConnectTrace { private: std::vector<PerBlockConnectTrace> blocksConnected; CTxMemPool &pool; + boost::signals2::scoped_connection m_connNotifyEntryRemoved; public: explicit ConnectTrace(CTxMemPool &_pool) : blocksConnected(1), pool(_pool) { - pool.NotifyEntryRemoved.connect(boost::bind(&ConnectTrace::NotifyEntryRemoved, this, _1, _2)); - } - - ~ConnectTrace() { - pool.NotifyEntryRemoved.disconnect(boost::bind(&ConnectTrace::NotifyEntryRemoved, this, _1, _2)); + m_connNotifyEntryRemoved = pool.NotifyEntryRemoved.connect(std::bind(&ConnectTrace::NotifyEntryRemoved, this, std::placeholders::_1, std::placeholders::_2)); } void BlockConnected(CBlockIndex* pindex, std::shared_ptr<const CBlock> pblock) { |