aboutsummaryrefslogtreecommitdiff
path: root/src/pj_datums.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-18 21:31:28 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-26 10:08:53 +0100
commit8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (patch)
tree1cd5751c91202070ba3ab6fbbbfbeb7832b980fc /src/pj_datums.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/pj_datums.cpp')
-rw-r--r--src/pj_datums.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pj_datums.cpp b/src/pj_datums.cpp
index 2951b7bd..acbe12f7 100644
--- a/src/pj_datums.cpp
+++ b/src/pj_datums.cpp
@@ -65,7 +65,7 @@ C_NAMESPACE_VAR const struct PJ_DATUMS pj_datums[] = {
"intl", "New Zealand Geodetic Datum 1949"},
{"OSGB36", "towgs84=446.448,-125.157,542.060,0.1502,0.2470,0.8421,-20.4894",
"airy", "Airy 1830"},
-{NULL, NULL, NULL, NULL}
+{nullptr, nullptr, nullptr, nullptr}
};
struct PJ_DATUMS *pj_get_datums_ref()
@@ -90,7 +90,7 @@ static const struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = {
{"athens", "23d42'58.815\"E"},
{"oslo", "10d43'22.5\"E"},
{"copenhagen","12d34'40.35\"E"},
- {NULL, NULL}
+ {nullptr, nullptr}
};
const PJ_PRIME_MERIDIANS *proj_list_prime_meridians(void)