Merge pull request #6899

a83f3c2 Add explicit shared_ptr constructor due to C++11 error (Bob McElrath)
pull/262/head
Wladimir J. van der Laan 9 years ago
commit b28c229324
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

@ -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;

Loading…
Cancel
Save