[cryptopp] update to newer version with MSVC 19.50 compatibility fixes (#50254)

This commit is contained in:
Mérill Téterel 2026-03-02 16:37:12 +01:00 committed by GitHub
parent 62159a45e1
commit f36d2c22b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 17 deletions

View File

@ -11,16 +11,3 @@ index 5ab920f9..74d939cf 100644
AllocatorWithCleanup() {}
template <class V, bool A> AllocatorWithCleanup(const AllocatorWithCleanup<V, A> &) {}
#endif
diff --git a/zdeflate.cpp b/zdeflate.cpp
index b3514b55..20717c24 100644
--- a/zdeflate.cpp
+++ b/zdeflate.cpp
@@ -413,7 +413,7 @@ unsigned int Deflator::LongestMatch(unsigned int &bestMatch) const
{
CRYPTOPP_ASSERT(scan[2] == match[2]);
unsigned int len = (unsigned int)(
-#if defined(_STDEXT_BEGIN) && !(defined(CRYPTOPP_MSC_VERSION) && (CRYPTOPP_MSC_VERSION < 1400 || CRYPTOPP_MSC_VERSION >= 1600)) && !defined(_STLPORT_VERSION)
+#if defined(_STDEXT_BEGIN) && !(defined(CRYPTOPP_MSC_VERSION) && (CRYPTOPP_MSC_VERSION < 1400 || CRYPTOPP_MSC_VERSION >= 1600)) && !defined(_STLPORT_VERSION) && !defined(__clang__)
stdext::unchecked_mismatch
#else
std::mismatch

View File

@ -12,8 +12,8 @@ vcpkg_from_github(
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO weidai11/cryptopp
REF "60f81a77e0c9a0e7ffc1ca1bc438ddfa2e43b78e"
SHA512 "0645de8710057722ce6543a7dbf93b2ef798fbf7966955c84708ba0d960826911e8f6b1080807a96d77debe527c063b84979d521c6b1e5ce3f5177bd1126b989"
REF "b5242667a24e3db8e4600e77b2e502ef204e5280"
SHA512 "4ed3e0a67cd6120d2c352c3bd42029ae38a5f2a0c57a4934980de8961d7f37134bedf17fca8178ea2ca9b43283763319dc108cb08f9ab0e43ead6da2d93d5c1c"
HEAD_REF master
PATCHES
patch.patch

View File

@ -1,6 +1,6 @@
{
"name": "cryptopp",
"version": "2025-12-01",
"version": "2026-03-02",
"description": "Crypto++ is a free C++ class library of cryptographic schemes.",
"homepage": "https://github.com/weidai11/cryptopp",
"license": "BSL-1.0",

View File

@ -2213,7 +2213,7 @@
"port-version": 1
},
"cryptopp": {
"baseline": "2025-12-01",
"baseline": "2026-03-02",
"port-version": 0
},
"cserialport": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "57a80c49ab9758a0c7138e0be740722af1b251a5",
"version": "2026-03-02",
"port-version": 0
},
{
"git-tree": "396be588d8d2e396ed25e084935a0a1be6f4fbb0",
"version": "2025-12-01",