aboutsummaryrefslogtreecommitdiff
path: root/src/PJ_unitconvert.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-18 22:02:44 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-26 10:08:54 +0100
commit8198bb580a5640415e09b8fd3533ffaa11317ca6 (patch)
tree61b68db0d946e19c3b71f590320babda05886510 /src/PJ_unitconvert.cpp
parent8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (diff)
downloadPROJ-8198bb580a5640415e09b8fd3533ffaa11317ca6.tar.gz
PROJ-8198bb580a5640415e09b8fd3533ffaa11317ca6.zip
cpp conversion: fix remaining warnings
Diffstat (limited to 'src/PJ_unitconvert.cpp')
-rw-r--r--src/PJ_unitconvert.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PJ_unitconvert.cpp b/src/PJ_unitconvert.cpp
index f7545680..b25fd5d2 100644
--- a/src/PJ_unitconvert.cpp
+++ b/src/PJ_unitconvert.cpp
@@ -80,10 +80,10 @@ typedef double (*tconvert)(double);
namespace { // anonymous namespace
struct TIME_UNITS {
- char *id; /* units keyword */
+ const char *id; /* units keyword */
tconvert t_in; /* unit -> mod. julian date function pointer */
tconvert t_out; /* mod. julian date > unit function pointer */
- char *name; /* comments */
+ const char *name; /* comments */
};
} // anonymous namespace
@@ -436,7 +436,7 @@ static double get_unit_conversion_factor(const char* name,
PJ *CONVERSION(unitconvert,0) {
/***********************************************************************/
struct pj_opaque_unitconvert *Q = static_cast<struct pj_opaque_unitconvert*>(pj_calloc (1, sizeof (struct pj_opaque_unitconvert)));
- char *s, *name;
+ const char *s, *name;
int i;
double f;
int xy_in_is_linear = -1; /* unknown */