From bd04dc39a2060a436440c2732a85a3ceada772f0 Mon Sep 17 00:00:00 2001
From: spiralvoice <spiralvoice>
Date: Wed, 4 Apr 2012 20:20:54 +0000
Subject: [PATCH] patch #7755

---
 distrib/ChangeLog         | 3 +++
 src/utils/lib/CryptoPP.cc | 2 +-
 src/utils/lib/CryptoPP.h  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/distrib/ChangeLog b/distrib/ChangeLog
index d2419220..0ee59614 100644
--- a/distrib/ChangeLog
+++ b/distrib/ChangeLog
@@ -14,6 +14,9 @@ http://mldonkey.sourceforge.net/Windows#MinGW_Installation
 ChangeLog
 =========
 
+2012/04/04
+7755: CryptoPP: Fix build with GCC 4.7
+
 2012/02/22
 7728: Update GNU config.guess and config.sub to version 2012-02-10
 7727: Makefile: call `$(CPP) -x c` instead of `cpp` (ygrek)
diff --git a/src/utils/lib/CryptoPP.cc b/src/utils/lib/CryptoPP.cc
index 6b12b0a4..be0b04a2 100644
--- a/src/utils/lib/CryptoPP.cc
+++ b/src/utils/lib/CryptoPP.cc
@@ -5413,7 +5413,7 @@ template <class T> const T& AbstractEuclideanDomain<T>::Gcd(const Element &a, co
 	Element g[3]={b, a};
 	unsigned int i0=0, i1=1, i2=2;
 
-	while (!Equal(g[i1], this->Identity()))
+	while (!this->Equal(g[i1], this->Identity()))
 	{
 		g[i2] = Mod(g[i0], g[i1]);
 		unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
diff --git a/src/utils/lib/CryptoPP.h b/src/utils/lib/CryptoPP.h
index af1621b2..900e7113 100644
--- a/src/utils/lib/CryptoPP.h
+++ b/src/utils/lib/CryptoPP.h
@@ -2633,7 +2633,7 @@ public:
 
 	pointer allocate(size_type n, const void * = NULL)
 	{
-		CheckSize(n);
+		this->CheckSize(n);
 		if (n == 0)
 			return NULL;
 		return new T[n];
@@ -5612,7 +5612,7 @@ template <class T, class B, class BASE> void IteratedHashBase2<T, B, BASE>::Trun
 {
 	this->ThrowIfInvalidTruncatedSize(size);
 
-	PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
+	this->PadLastBlock(this->BlockSize() - 2*sizeof(HashWordType));
 	CorrectEndianess(this->m_data, this->m_data, this->BlockSize() - 2*sizeof(HashWordType));
 
 	this->m_data[this->m_data.size()-2] = B::ToEnum() ? this->GetBitCountHi() : this->GetBitCountLo();
-- 
2.11.4.GIT