[Pkg-gnupg-commit] [gpgme] 58/132: qt: Add missing #include <functional>
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed Apr 26 01:01:23 UTC 2017
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gpgme.
commit 60064c665ec98a2a994fc6c8ad701e60b963ce7e
Author: Igor Gnatenko <ignatenkobrain at fedoraproject.org>
Date: Sat Feb 11 08:36:24 2017 +0100
qt: Add missing #include <functional>
* lang/qt/src/qgpgmenewcryptoconfig.cpp,
lang/qt/src/threadedjobmixin.h: Include functional.
--
With GCC 7.0, functional is not included transitively and we get:
In file included from qgpgmedeletejob.h:39:0,
from qgpgmedeletejob.cpp:38:
threadedjobmixin.h:98:33: error: 'function' in namespace 'std'
does not name a template type
void setFunction(const std::function<T_result()> &function)
^~~~~~~~
std::{function,bind,placeholders,mem_fn} are defined in functional.
References: https://bugzilla.redhat.com/show_bug.cgi?id=1417383
Signed-off-by: Igor Gnatenko <ignatenkobrain at fedoraproject.org>
GnuPG-Bug-Id: 2955
Commit Message amended by Andre Heinecke
Signed-off-by: Andre Heinecke <aheinecke at intevation.de>
---
lang/qt/src/qgpgmenewcryptoconfig.cpp | 1 +
lang/qt/src/threadedjobmixin.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/lang/qt/src/qgpgmenewcryptoconfig.cpp b/lang/qt/src/qgpgmenewcryptoconfig.cpp
index 4738a03..6901eef 100644
--- a/lang/qt/src/qgpgmenewcryptoconfig.cpp
+++ b/lang/qt/src/qgpgmenewcryptoconfig.cpp
@@ -49,6 +49,7 @@
#include <sstream>
#include <string>
#include <cassert>
+#include <functional>
using namespace QGpgME;
using namespace GpgME;
diff --git a/lang/qt/src/threadedjobmixin.h b/lang/qt/src/threadedjobmixin.h
index 32b23db..5ad2737 100644
--- a/lang/qt/src/threadedjobmixin.h
+++ b/lang/qt/src/threadedjobmixin.h
@@ -51,6 +51,7 @@
#include "job.h"
#include <cassert>
+#include <functional>
namespace QGpgME
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git
More information about the Pkg-gnupg-commit
mailing list