aboutsummaryrefslogtreecommitdiff
path: root/src/test228.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/test228.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/test228.cpp')
-rw-r--r--src/test228.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test228.cpp b/src/test228.cpp
index 83d29f8f..fcacd7c9 100644
--- a/src/test228.cpp
+++ b/src/test228.cpp
@@ -49,7 +49,7 @@ static void* thread_main(void* unused)
x = -5.2*DEG_TO_RAD;
y = 50*DEG_TO_RAD;
proj_ret = pj_transform(p_WGS84_proj,
- p_OSGB36_proj, 1, 1, &x, &y, NULL );
+ p_OSGB36_proj, 1, 1, &x, &y, nullptr );
x *= RAD_TO_DEG;
y *= RAD_TO_DEG;
/*printf("%.18f %.18f\n", x, y); */
@@ -60,7 +60,7 @@ static void* thread_main(void* unused)
pj_free (p_OSGB36_proj);
pj_free (p_WGS84_proj);
- return NULL;
+ return nullptr;
}
int main()
@@ -73,8 +73,8 @@ int main()
pthread_attr_init(&attr1);
pthread_attr_init(&attr2);
- pthread_create(&tid1, &attr1, thread_main, NULL);
- pthread_create(&tid2, &attr2, thread_main, NULL);
+ pthread_create(&tid1, &attr1, thread_main, nullptr);
+ pthread_create(&tid2, &attr2, thread_main, nullptr);
while(started != 2);
run = 1;
for(i=0;i<2;i++)