aboutsummaryrefslogtreecommitdiff
path: root/src/multistresstest.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/multistresstest.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/multistresstest.cpp')
-rw-r--r--src/multistresstest.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/multistresstest.cpp b/src/multistresstest.cpp
index a6653e7e..234783b3 100644
--- a/src/multistresstest.cpp
+++ b/src/multistresstest.cpp
@@ -243,7 +243,7 @@ static void TestThread()
dst_pj_list[i] = custom_pj_init_plus_ctx( ctx, test->dst_def );
{
- int skipTest = (src_pj_list[i] == NULL || dst_pj_list[i] == NULL);
+ int skipTest = (src_pj_list[i] == nullptr || dst_pj_list[i] == nullptr);
if ( skipTest != test->skip )
fprintf( stderr, "Threaded projection initialization does not match unthreaded initialization\n" );
@@ -335,7 +335,7 @@ static void *PosixTestThread( void *pData )
{
(void)pData;
TestThread();
- return NULL;
+ return nullptr;
}
#endif
@@ -363,7 +363,7 @@ static int do_main(void)
src_pj = custom_pj_init_plus_ctx( pj_get_default_ctx(), test->src_def );
dst_pj = custom_pj_init_plus_ctx( pj_get_default_ctx(), test->dst_def );
- if( src_pj == NULL )
+ if( src_pj == nullptr )
{
printf( "Unable to translate:\n%s\n", test->src_def );
test->skip = 1;
@@ -371,7 +371,7 @@ static int do_main(void)
continue;
}
- if( dst_pj == NULL )
+ if( dst_pj == nullptr )
{
printf( "Unable to translate:\n%s\n", test->dst_def );
test->skip = 1;
@@ -439,7 +439,7 @@ static int do_main(void)
active_thread_count++;
pthread_create( &(ahThread[i]), &hThreadAttr,
- PosixTestThread, NULL );
+ PosixTestThread, nullptr );
}
printf( "%d test threads launched.\n", num_threads );