aboutsummaryrefslogtreecommitdiffstats
path: root/lang/cpp/src/global.h
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2018-12-03 11:20:33 +0000
committerAndre Heinecke <[email protected]>2018-12-03 11:25:00 +0000
commit1d31420650bfa7ca1d1503cc7431b3360e86022c (patch)
tree3155599aae033d00696c12c55459ecbe1b92b598 /lang/cpp/src/global.h
parentdoc: Minor comment cleanups. (diff)
downloadgpgme-1d31420650bfa7ca1d1503cc7431b3360e86022c.tar.gz
gpgme-1d31420650bfa7ca1d1503cc7431b3360e86022c.zip
qt,cpp: Consistently use nullptr and override
* lang/cpp/src/Makefile.am, lang/qt/src/Makefile.am (AM_CPPFLAGS): Add suggest-override and zero-as-null-pointer-constant warnings. * lang/cpp/src/*, lang/qt/src/*: Consistenly use nullptr and override. -- This was especially important for the headers so that downstream users of GpgME++ or QGpgME do not get flooded by warnings if they have these warnings enabled. It also improves compiler errors/warnings in case of accidental mistakes.
Diffstat (limited to 'lang/cpp/src/global.h')
-rw-r--r--lang/cpp/src/global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/cpp/src/global.h b/lang/cpp/src/global.h
index e303c49a..9760e215 100644
--- a/lang/cpp/src/global.h
+++ b/lang/cpp/src/global.h
@@ -165,7 +165,7 @@ GPGMEPP_EXPORT bool hasFeature(unsigned long feature, unsigned long feature2);
struct __safe_bool_dummy__ { void nonnull() {} }; \
typedef void ( __safe_bool_dummy__::*unspecified_bool_type )(); \
public: \
- operator unspecified_bool_type() const { return ( Cond ) ? &__safe_bool_dummy__::nonnull : 0 ; }
+ operator unspecified_bool_type() const { return ( Cond ) ? &__safe_bool_dummy__::nonnull : nullptr; }
# endif
inline int _gpgmepp_strcmp(const char *s1, const char *s2)