[git] GPGME - branch, master, updated. gpgme-1.8.0-58-g60064c6

[by Igor Gnatenko]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".

The branch, master has been updated
       via  60064c665ec98a2a994fc6c8ad701e60b963ce7e (commit)
      from  903bf16a416b1bf608b1e647937c9b06864b0141 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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
 {

-----------------------------------------------------------------------

Summary of changes:
 lang/qt/src/qgpgmenewcryptoconfig.cpp | 1 +
 lang/qt/src/threadedjobmixin.h        | 1 +
 2 files changed, 2 insertions(+)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org