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/context.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/context.h')
-rw-r--r-- | lang/cpp/src/context.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/cpp/src/context.h b/lang/cpp/src/context.h index d3700e03..b6b902a9 100644 --- a/lang/cpp/src/context.h +++ b/lang/cpp/src/context.h @@ -70,7 +70,7 @@ public: static Context *createForProtocol(Protocol proto); /** Same as above but returning a unique ptr. */ static std::unique_ptr<Context> create(Protocol proto); - static std::unique_ptr<Context> createForEngine(Engine engine, Error *err = 0); + static std::unique_ptr<Context> createForEngine(Engine engine, Error *err = nullptr); virtual ~Context(); // @@ -161,7 +161,7 @@ public: // Key Listing // - GpgME::Error startKeyListing(const char *pattern = 0, bool secretOnly = false); + GpgME::Error startKeyListing(const char *pattern = nullptr, bool secretOnly = false); GpgME::Error startKeyListing(const char *patterns[], bool secretOnly = false); Key nextKey(GpgME::Error &e); |