aboutsummaryrefslogtreecommitdiff
path: root/src/pj_mutex.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_mutex.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/pj_mutex.cpp')
-rw-r--r--src/pj_mutex.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/pj_mutex.cpp b/src/pj_mutex.cpp
index dc4a441b..61487cec 100644
--- a/src/pj_mutex.cpp
+++ b/src/pj_mutex.cpp
@@ -106,7 +106,14 @@ void pj_cleanup_lock()
#include "pthread.h"
#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
+#endif
static pthread_mutex_t core_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
#else
static pthread_mutex_t core_lock;