diff options
author | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
---|---|---|
committer | Ben McGinnes <[email protected]> | 2018-12-04 21:49:41 +0000 |
commit | 8d2621fcad3ded2a4184c00a04ca1002b4de98cc (patch) | |
tree | c80dde4d38e975b58454046303c286b60f4556bf /lang/cpp/src/global.h | |
parent | python: docs update (diff) | |
parent | build: Remove --with-*-prefix, which is no need any more. (diff) | |
download | gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.tar.gz gpgme-8d2621fcad3ded2a4184c00a04ca1002b4de98cc.zip |
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
Diffstat (limited to 'lang/cpp/src/global.h')
-rw-r--r-- | lang/cpp/src/global.h | 2 |
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) |