GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-19 13:27:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 3516a31eaa into merged_master (Bitcoin PR #18234)

Browse source
This commit is contained in:
Andrew Poelstra 2020-11-26 01:07:50 +00:00
commit 2d35bebf6b
14 changed files with 152 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/rpc/misc.cpp
View file

@ -424,7 +424,7 @@ static UniValue mockscheduler(const JSONRPCRequest& request)
// protect against null pointer dereference
CHECK_NONFATAL(g_rpc_node);
CHECK_NONFATAL(g_rpc_node->scheduler);
g_rpc_node->scheduler->MockForward(boost::chrono::seconds(delta_seconds));
g_rpc_node->scheduler->MockForward(std::chrono::seconds(delta_seconds));
return NullUniValue;
}