diff options
author | MarcoFalke <falke.marco@gmail.com> | 2018-12-29 14:13:54 +0100 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2018-12-29 14:14:26 +0100 |
commit | cbb91cd0ec8e858b986776723ed4dc25df4b74ee (patch) | |
tree | b85e9851d51a56aff25fb3edc19d430eac95287e /src/rpc | |
parent | 3c9b98bd6e0cd9e903ed4e7ddf35533f0754a3b8 (diff) | |
parent | cb53b825c26af6e628ba88d72b2000e75bedbbc6 (diff) |
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/rpc')
-rw-r--r-- | src/rpc/server.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 03e1c81132..e7e047334e 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -15,7 +15,6 @@ #include <util/strencodings.h> #include <util/system.h> -#include <boost/bind.hpp> #include <boost/signals2/signal.hpp> #include <boost/algorithm/string/classification.hpp> #include <boost/algorithm/string/split.hpp> @@ -504,11 +503,7 @@ UniValue CRPCTable::execute(const JSONRPCRequest &request) const std::vector<std::string> CRPCTable::listCommands() const { std::vector<std::string> commandList; - typedef std::map<std::string, const CRPCCommand*> commandMap; - - std::transform( mapCommands.begin(), mapCommands.end(), - std::back_inserter(commandList), - boost::bind(&commandMap::value_type::first,_1) ); + for (const auto& i : mapCommands) commandList.emplace_back(i.first); return commandList; } |