aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2016-10-05 14:27:18 +0000
committerAndre Heinecke <[email protected]>2016-10-05 14:27:18 +0000
commit39dd7585f5a7d801942efcb375d6dd46d01d2968 (patch)
tree95a3fc05726e3c263338822ef9a9bddf450ba932
parentqt: Disable t-wkspublish test (diff)
downloadgpgme-39dd7585f5a7d801942efcb375d6dd46d01d2968.tar.gz
gpgme-39dd7585f5a7d801942efcb375d6dd46d01d2968.zip
cpp: Fix gcc diagnostic push / pop
* lang/cpp/src/context.cpp: Fix pragmas. -- This fixes an error with -Werror=unknown-pragmas
-rw-r--r--lang/cpp/src/context.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 34d0efca..11211048 100644
--- a/lang/cpp/src/context.cpp
+++ b/lang/cpp/src/context.cpp
@@ -699,7 +699,7 @@ Error Context::startPasswd(const Key &key)
}
-#pragma GCC push_diagnostics
+#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
Error Context::edit(const Key &key, std::unique_ptr<EditInteractor> func, Data &data)
@@ -759,7 +759,7 @@ Error Context::startCardEditing(const Key &key, std::unique_ptr<EditInteractor>
dp ? dp->data : 0));
}
-#pragma GCC pop_diagnostics
+#pragma GCC diagnostic pop
EditInteractor *Context::lastCardEditInteractor() const
{