diff options
| author | whythat <[email protected]> | 2016-07-18 12:26:21 +0300 |
|---|---|---|
| committer | whythat <[email protected]> | 2016-08-09 03:11:45 +0300 |
| commit | 5e187e70012c247b96783f7fa9bcbd0289504ad5 (patch) | |
| tree | 70dcd0ede59105a0c5ae04889310a812127add40 /src/rpc/server.cpp | |
| parent | use std::map::erase(const_iterator, const_iterator) to get non-constant iterator (diff) | |
| download | discoin-5e187e70012c247b96783f7fa9bcbd0289504ad5.tar.xz discoin-5e187e70012c247b96783f7fa9bcbd0289504ad5.zip | |
use c++11 std::unique_ptr instead of boost::shared_ptr
Diffstat (limited to 'src/rpc/server.cpp')
| -rw-r--r-- | src/rpc/server.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 23149baa6..4b594f5fa 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -25,6 +25,8 @@ #include <boost/thread.hpp> #include <boost/algorithm/string/case_conv.hpp> // for to_upper() +#include <memory> // for unique_ptr + using namespace RPCServer; using namespace std; @@ -34,9 +36,8 @@ static std::string rpcWarmupStatus("RPC server started"); static CCriticalSection cs_rpcWarmup; /* Timer-creating functions */ static RPCTimerInterface* timerInterface = NULL; -/* Map of name to timer. - * @note Can be changed to std::unique_ptr when C++11 */ -static std::map<std::string, boost::shared_ptr<RPCTimerBase> > deadlineTimers; +/* Map of name to timer. */ +static std::map<std::string, std::unique_ptr<RPCTimerBase> > deadlineTimers; static struct CRPCSignals { @@ -490,7 +491,7 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6 throw JSONRPCError(RPC_INTERNAL_ERROR, "No timer handler registered for RPC"); deadlineTimers.erase(name); LogPrint("rpc", "queue run of timer %s in %i seconds (using %s)\n", name, nSeconds, timerInterface->Name()); - deadlineTimers.insert(std::make_pair(name, boost::shared_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000)))); + deadlineTimers.insert(std::make_pair(name, std::unique_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000)))); } CRPCTable tableRPC; |