aboutsummaryrefslogtreecommitdiff
path: root/src/vector1.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/vector1.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/vector1.cpp')
-rw-r--r--src/vector1.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vector1.cpp b/src/vector1.cpp
index 22e1f5d0..869dd76a 100644
--- a/src/vector1.cpp
+++ b/src/vector1.cpp
@@ -15,14 +15,14 @@ freev2(void **v, int nrows) {
vector2(int nrows, int ncols, int size) {
void **s;
- if ((s = (void **)pj_malloc(sizeof(void *) * nrows)) != NULL) {
+ if ((s = (void **)pj_malloc(sizeof(void *) * nrows)) != nullptr) {
int rsize, i;
rsize = size * ncols;
for (i = 0; i < nrows; ++i)
if (!(s[i] = pj_malloc(rsize))) {
freev2(s, i);
- return (void **)0;
+ return (void **)nullptr;
}
}
return s;