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/configuration.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/configuration.h')
-rw-r--r-- | lang/cpp/src/configuration.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/cpp/src/configuration.h b/lang/cpp/src/configuration.h index 6993b6dd..2e577156 100644 --- a/lang/cpp/src/configuration.h +++ b/lang/cpp/src/configuration.h @@ -145,7 +145,7 @@ private: class GPGMEPP_EXPORT Option { public: - Option() : comp(), opt(0) {} + Option() : comp(), opt(nullptr) {} Option(const shared_gpgme_conf_comp_t &gpgme_comp, gpgme_conf_opt_t gpgme_opt) : comp(gpgme_comp), opt(gpgme_opt) {} @@ -228,7 +228,7 @@ class GPGMEPP_EXPORT Argument friend class ::GpgME::Configuration::Option; Argument(const shared_gpgme_conf_comp_t &comp, gpgme_conf_opt_t opt, gpgme_conf_arg_t arg, bool owns); public: - Argument() : comp(), opt(0), arg(0) {} + Argument() : comp(), opt(nullptr), arg(nullptr) {} //Argument( const shared_gpgme_conf_comp_t & comp, gpgme_conf_opt_t opt, gpgme_conf_arg_t arg ); Argument(const Argument &other); ~Argument(); |