diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-29 13:39:51 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-29 13:39:56 +0100 |
| commit | b28c229324d02963d79d66df85efe6bd78db451e (patch) | |
| tree | c84982f99e7c4d9f12673e3c4b0bf532d37de696 /src | |
| parent | b2ce2c1f0fb12af82f3ff9f20c66492b9263fa10 (diff) | |
| parent | a83f3c2426429ddf3e38cfc26204398c097a23d4 (diff) | |
| download | bitcoin-b28c229324d02963d79d66df85efe6bd78db451e.tar.xz | |
Merge pull request #6899
a83f3c2 Add explicit shared_ptr constructor due to C++11 error (Bob McElrath)
Diffstat (limited to 'src')
| -rw-r--r-- | src/rpcserver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp index fa60f8c833..8bda5a0373 100644 --- a/src/rpcserver.cpp +++ b/src/rpcserver.cpp @@ -563,7 +563,7 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6 deadlineTimers.erase(name); RPCTimerInterface* timerInterface = timerInterfaces[0]; LogPrint("rpc", "queue run of timer %s in %i seconds (using %s)\n", name, nSeconds, timerInterface->Name()); - deadlineTimers.insert(std::make_pair(name, timerInterface->NewTimer(func, nSeconds*1000))); + deadlineTimers.insert(std::make_pair(name, boost::shared_ptr<RPCTimerBase>(timerInterface->NewTimer(func, nSeconds*1000)))); } const CRPCTable tableRPC; |