Merge pull request #6899
a83f3c2
Add explicit shared_ptr constructor due to C++11 error (Bob McElrath)
This commit is contained in:
commit
b28c229324
1 changed files with 1 additions and 1 deletions
|
@ -563,7 +563,7 @@ void RPCRunLater(const std::string& name, boost::function<void(void)> func, int6
|
||||||
deadlineTimers.erase(name);
|
deadlineTimers.erase(name);
|
||||||
RPCTimerInterface* timerInterface = timerInterfaces[0];
|
RPCTimerInterface* timerInterface = timerInterfaces[0];
|
||||||
LogPrint("rpc", "queue run of timer %s in %i seconds (using %s)\n", name, nSeconds, timerInterface->Name());
|
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;
|
const CRPCTable tableRPC;
|
||||||
|
|
Loading…
Reference in a new issue