[Mldonkey-commits] mldonkey distrib/ChangeLog src/utils/lib/Crypto...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       12/04/04 20:20:54

Modified files:
        distrib        : ChangeLog 
        src/utils/lib  : CryptoPP.cc CryptoPP.h 

Log message:
        patch #7755

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1544&r2=1.1545
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP.cc?cvsroot=mldonkey&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/CryptoPP.h?cvsroot=mldonkey&r1=1.10&r2=1.11

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1544
retrieving revision 1.1545
diff -u -b -r1.1544 -r1.1545
--- distrib/ChangeLog   22 Feb 2012 20:24:20 -0000      1.1544
+++ distrib/ChangeLog   4 Apr 2012 20:20:54 -0000       1.1545
@@ -14,6 +14,9 @@
 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)

Index: src/utils/lib/CryptoPP.cc
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/utils/lib/CryptoPP.cc   23 Oct 2010 18:23:38 -0000      1.11
+++ src/utils/lib/CryptoPP.cc   4 Apr 2012 20:20:54 -0000       1.12
@@ -5413,7 +5413,7 @@
        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;

Index: src/utils/lib/CryptoPP.h
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/CryptoPP.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/utils/lib/CryptoPP.h    7 May 2011 18:40:00 -0000       1.10
+++ src/utils/lib/CryptoPP.h    4 Apr 2012 20:20:54 -0000       1.11
@@ -2633,7 +2633,7 @@
 
        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 @@
 {
        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();