From 8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Dec 2018 21:31:28 +0100 Subject: cpp conversion: fix zero-as-null-pointer-constant warnings --- src/PJ_goode.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/PJ_goode.cpp') diff --git a/src/PJ_goode.cpp b/src/PJ_goode.cpp index 14c78439..c79d125e 100644 --- a/src/PJ_goode.cpp +++ b/src/PJ_goode.cpp @@ -50,9 +50,9 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ static PJ *destructor (PJ *P, int errlev) { /* Destructor */ - if (0==P) - return 0; - if (0==P->opaque) + if (nullptr==P) + return nullptr; + if (nullptr==P->opaque) return pj_default_destructor (P, errlev); pj_free (static_cast(P->opaque)->sinu); pj_free (static_cast(P->opaque)->moll); @@ -63,13 +63,13 @@ static PJ *destructor (PJ *P, int errlev) { /* Destructor */ PJ *PROJECTION(goode) { struct pj_opaque *Q = static_cast(pj_calloc (1, sizeof (struct pj_opaque))); - if (0==Q) + if (nullptr==Q) return pj_default_destructor (P, ENOMEM); P->opaque = Q; P->destructor = destructor; P->es = 0.; - if (!(Q->sinu = pj_sinu(0)) || !(Q->moll = pj_moll(0))) + if (!(Q->sinu = pj_sinu(nullptr)) || !(Q->moll = pj_moll(nullptr))) return destructor (P, ENOMEM); Q->sinu->es = 0.; Q->sinu->ctx = P->ctx; -- cgit v1.2.3