diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-18 21:31:28 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 10:08:53 +0100 |
| commit | 8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (patch) | |
| tree | 1cd5751c91202070ba3ab6fbbbfbeb7832b980fc /src/PJ_cass.cpp | |
| parent | 919dc5ca50839541568ef5c0f18f2156d639beef (diff) | |
| download | PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip | |
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/PJ_cass.cpp')
| -rw-r--r-- | src/PJ_cass.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/PJ_cass.cpp b/src/PJ_cass.cpp index 2488f405..c831558c 100644 --- a/src/PJ_cass.cpp +++ b/src/PJ_cass.cpp @@ -84,10 +84,10 @@ static LP s_inverse (XY xy, PJ *P) { /* Spheroidal, inverse */ } static PJ *destructor (PJ *P, int errlev) { /* Destructor */ - if (0==P) - return 0; + if (nullptr==P) + return nullptr; - if (0==P->opaque) + if (nullptr==P->opaque) return pj_default_destructor (P, errlev); pj_dealloc (static_cast<struct pj_opaque*>(P->opaque)->en); @@ -107,12 +107,12 @@ PJ *PROJECTION(cass) { /* otherwise it's ellipsoidal */ P->opaque = static_cast<struct pj_opaque*>(pj_calloc (1, sizeof (struct pj_opaque))); - if (0==P->opaque) + if (nullptr==P->opaque) return pj_default_destructor (P, ENOMEM); P->destructor = destructor; static_cast<struct pj_opaque*>(P->opaque)->en = pj_enfn (P->es); - if (0==static_cast<struct pj_opaque*>(P->opaque)->en) + if (nullptr==static_cast<struct pj_opaque*>(P->opaque)->en) return pj_default_destructor (P, ENOMEM); static_cast<struct pj_opaque*>(P->opaque)->m0 = pj_mlfn (P->phi0, sin (P->phi0), cos (P->phi0), static_cast<struct pj_opaque*>(P->opaque)->en); |