From a6220adf3081c9c848f6d0a6fc3774cb168ccf9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ingo=20Kl=C3=B6cker?= Date: Mon, 4 Jan 2021 16:29:36 +0100 Subject: [PATCH] cpp: Add const-overload of UserID::Signature::operator< lang/cpp/src/key.h, lang/cpp/src/key.cpp (UserID::Signature::operator<): Add const-overload. Deprecate non-const overload. -- This fixes compilation on FreeBSD with clang 10. --- lang/cpp/src/key.cpp | 6 ++++++ lang/cpp/src/key.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lang/cpp/src/key.cpp b/lang/cpp/src/key.cpp index e536d080..f9cc2b60 100644 --- a/lang/cpp/src/key.cpp +++ b/lang/cpp/src/key.cpp @@ -866,6 +866,12 @@ UserID::Signature::Signature(const shared_gpgme_key_t &k, gpgme_user_id_t u, gpg } bool UserID::Signature::operator<(const Signature &other) +{ + // kept for binary compatibility + return static_cast(this)->operator<(other); +} + +bool UserID::Signature::operator<(const Signature &other) const { // based on cmp_signodes() in g10/keylist.c diff --git a/lang/cpp/src/key.h b/lang/cpp/src/key.h index a7931672..515bf185 100644 --- a/lang/cpp/src/key.h +++ b/lang/cpp/src/key.h @@ -468,7 +468,9 @@ public: } /*! Defines a canonical sort order for signatures of the same user ID. */ - bool operator<(const Signature &other); + bool operator<(const Signature &other) const; + + GPGMEPP_DEPRECATED bool operator<(const Signature &other); bool isNull() const {