From 610957f7035242f15743c399ffd429b92bc36206 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Dec 2018 20:24:11 +0100 Subject: cpp conversion: minimal steps to fix compilation errors, not warnings --- src/projects.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/projects.h') diff --git a/src/projects.h b/src/projects.h index 11467d56..ac1a2152 100644 --- a/src/projects.h +++ b/src/projects.h @@ -197,7 +197,6 @@ struct PJconsts; union PJ_COORD; struct geod_geodesic; -struct pj_opaque; struct ARG_list; struct PJ_REGION_S; typedef struct PJ_REGION_S PJ_Region; @@ -260,7 +259,7 @@ PJ_OPERATOR: *****************************************************************************/ typedef PJ *(* PJ_CONSTRUCTOR) (PJ *); -typedef void *(* PJ_DESTRUCTOR) (PJ *, int); +typedef PJ *(* PJ_DESTRUCTOR) (PJ *, int); typedef PJ_COORD (* PJ_OPERATOR) (PJ_COORD, PJ *); /****************************************************************************/ @@ -290,7 +289,7 @@ struct PJconsts { char *def_ellps; struct geod_geodesic *geod; /* For geodesic computations */ - struct pj_opaque *opaque; /* Projection specific parameters, Defined in PJ_*.c */ + void *opaque; /* Projection specific parameters, Defined in PJ_*.c */ int inverted; /* Tell high level API functions to swap inv/fwd */ @@ -828,7 +827,7 @@ extern char const PROJ_DLL pj_release[]; struct PJ_DATUMS PROJ_DLL *pj_get_datums_ref( void ); -void *pj_default_destructor (PJ *P, int errlev); +PJ *pj_default_destructor (PJ *P, int errlev); double PROJ_DLL pj_atof( const char* nptr ); double pj_strtod( const char *nptr, char **endptr ); -- cgit v1.2.3 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/projects.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/projects.h') diff --git a/src/projects.h b/src/projects.h index ac1a2152..099684d3 100644 --- a/src/projects.h +++ b/src/projects.h @@ -627,8 +627,8 @@ C_NAMESPACE PJ *pj_##name (PJ *P) { \ if (P) \ return pj_projection_specific_setup_##name (P); \ P = (PJ*) pj_calloc (1, sizeof(PJ)); \ - if (0==P) \ - return 0; \ + if (nullptr==P) \ + return nullptr; \ P->destructor = pj_default_destructor; \ P->descr = des_##name; \ P->need_ellps = NEED_ELLPS; \ -- cgit v1.2.3 From 8198bb580a5640415e09b8fd3533ffaa11317ca6 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Dec 2018 22:02:44 +0100 Subject: cpp conversion: fix remaining warnings --- src/projects.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/projects.h') diff --git a/src/projects.h b/src/projects.h index 099684d3..b76205a5 100644 --- a/src/projects.h +++ b/src/projects.h @@ -492,10 +492,10 @@ typedef union { double f; int i; char *s; } PROJVALUE; struct PJ_DATUMS { - char *id; /* datum keyword */ - char *defn; /* ie. "to_wgs84=..." */ - char *ellipse_id; /* ie from ellipse table */ - char *comments; /* EPSG code, etc */ + const char *id; /* datum keyword */ + const char *defn; /* ie. "to_wgs84=..." */ + const char *ellipse_id; /* ie from ellipse table */ + const char *comments; /* EPSG code, etc */ }; -- cgit v1.2.3