aboutsummaryrefslogtreecommitdiff
path: root/src/httprpc.cpp
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2017-08-16 15:54:51 +0200
committerMarcoFalke <[email protected]>2017-08-16 15:55:48 +0200
commitc484ec6c9b85ca4e331e395c564ae232fd0681dd (patch)
treebe4837f43af4a7fb2c48753849bb3e7a9b776387 /src/httprpc.cpp
parentMerge #11056: disable jni in builds (diff)
parentUse nullptr instead of zero (0) as the null pointer constant (diff)
downloaddiscoin-c484ec6c9b85ca4e331e395c564ae232fd0681dd.tar.xz
discoin-c484ec6c9b85ca4e331e395c564ae232fd0681dd.zip
Merge #10645: Use nullptr (C++11) instead of zero (0) as the null pointer constant
36d326e8b Use nullptr instead of zero (0) as the null pointer constant (practicalswift) Pull request description: Use `nullptr` instead of zero (0) as the null pointer constant. The road towards `nullptr` (C++11) is split into two PRs: * `NULL` → `nullptr` is handled in PR #10483 (scripted) * `0` → `nullptr` is handled in PR #10645 (manual, this PR) By using the C++11 keyword `nullptr` we are guaranteed a prvalue of type `std::nullptr_t`. For a more thorough discussion, see "A name for the null pointer: nullptr" (Sutter & Stroustrup), http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf Tree-SHA512: 5412404b40a94ea2d9fc8f81573559c4ffe559749301d486b09d41a7a736345ad602d08ac590930bb00a49692b6075520cf3d543e4da6ccd5b29fa9bcc3f15ea
Diffstat (limited to 'src/httprpc.cpp')
-rw-r--r--src/httprpc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
index dd219c729..8c1a74677 100644
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -62,7 +62,7 @@ private:
/* Pre-base64-encoded authentication token */
static std::string strRPCUserColonPass;
/* Stored RPC timer interface (for unregistration) */
-static HTTPRPCTimerInterface* httpRPCTimerInterface = 0;
+static HTTPRPCTimerInterface* httpRPCTimerInterface = nullptr;
static void JSONErrorReply(HTTPRequest* req, const UniValue& objError, const UniValue& id)
{
@@ -255,6 +255,6 @@ void StopHTTPRPC()
if (httpRPCTimerInterface) {
RPCUnsetTimerInterface(httpRPCTimerInterface);
delete httpRPCTimerInterface;
- httpRPCTimerInterface = 0;
+ httpRPCTimerInterface = nullptr;
}
}