[Pkg-gnupg-commit] [gpgme] 228/412: Cpp: Add feature enum for new identify

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gpgme.

commit 537cb871fd59f3a20c697a046715e6339ff6633b
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Jul 13 11:56:18 2016 +0200

    Cpp: Add feature enum for new identify
    
    * lang/cpp/src/context.cpp (supported_features2): Add
    BinaryAndFineGrainedIdentify
    * lang/cpp/src/global.h (Feature2): ditto.
    
    --
    This is mostly for compatible code with KF5::Gpgmepp where there
    is no hard requirement against gpgme 1.7. With 1.7 a version
    check would also suffice.
---
 lang/cpp/src/context.cpp | 1 +
 lang/cpp/src/global.h    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lang/cpp/src/context.cpp b/lang/cpp/src/context.cpp
index 9e31b6a..20d827e 100644
--- a/lang/cpp/src/context.cpp
+++ b/lang/cpp/src/context.cpp
@@ -1519,6 +1519,7 @@ static const unsigned long supported_features = 0
         ;
 
 static const unsigned long supported_features2 = 0
+        | GpgME::BinaryAndFineGrainedIdentify
         ;
 
 bool GpgME::hasFeature(unsigned long features)
diff --git a/lang/cpp/src/global.h b/lang/cpp/src/global.h
index 9be5202..508e1d7 100644
--- a/lang/cpp/src/global.h
+++ b/lang/cpp/src/global.h
@@ -131,8 +131,10 @@ enum Feature {
     FeatureMaxValue                            = 0x80000000
 };
 enum Feature2 {
+    BinaryAndFineGrainedIdentify               = 0x00000001, // gpgme >= 1.7.0
     Feature2MaxValue                           = 0x80000000
 };
+
 // use hasFeature( unsigned long, unsigned long ) instead
 GPGMEPP_DEPRECATED_EXPORT bool hasFeature(unsigned long feature);
 GPGMEPP_EXPORT bool hasFeature(unsigned long feature, unsigned long feature2);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git