[patch] GCC 3.4.x compatibility patch

0.02-gcc34.patch (text/plain), 2.03 KB, created by Mihai Limbasan on 2005-01-04 05:47:54 UTC

diff -Naur lzma-0.02-orig/AriBitCoder.h lzma-0.02/AriBitCoder.h
--- lzma-0.02-orig/AriBitCoder.h	2004-02-26 00:21:03.000000000 +0200
+++ lzma-0.02/AriBitCoder.h	2005-01-04 15:16:18.509962648 +0200
@@ -51,13 +51,13 @@
 public:
   void Encode(CRangeEncoder *aRangeEncoder, UINT32 aSymbol)
   {
-    aRangeEncoder->EncodeBit(m_Probability, kNumBitModelTotalBits, aSymbol);
-    UpdateModel(aSymbol);
+    aRangeEncoder->EncodeBit(CBitEncoder<aNumMoveBits>::m_Probability, kNumBitModelTotalBits, aSymbol);
+    CBitEncoder<aNumMoveBits>::UpdateModel(aSymbol);
   }
   UINT32 GetPrice(UINT32 aSymbol) const
   {
     return g_PriceTables.m_StatePrices[
-      (((m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
+      (((CBitEncoder<aNumMoveBits>::m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits];
   }
 };
 
@@ -68,11 +68,11 @@
 public:
   UINT32 Decode(CRangeDecoder *aRangeDecoder)
   {
-    UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * m_Probability;
+    UINT32 aNewBound = (aRangeDecoder->m_Range >> kNumBitModelTotalBits) * CBitDecoder<aNumMoveBits>::m_Probability;
     if (aRangeDecoder->m_Code < aNewBound)
     {
       aRangeDecoder->m_Range = aNewBound;
-      m_Probability += (kBitModelTotal - m_Probability) >> aNumMoveBits;
+      CBitDecoder<aNumMoveBits>::m_Probability += (kBitModelTotal - CBitDecoder<aNumMoveBits>::m_Probability) >> aNumMoveBits;
       if (aRangeDecoder->m_Range < kTopValue)
       {
         aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();
@@ -84,7 +84,7 @@
     {
       aRangeDecoder->m_Range -= aNewBound;
       aRangeDecoder->m_Code -= aNewBound;
-      m_Probability -= (m_Probability) >> aNumMoveBits;
+      CBitDecoder<aNumMoveBits>::m_Probability -= (CBitDecoder<aNumMoveBits>::m_Probability) >> aNumMoveBits;
       if (aRangeDecoder->m_Range < kTopValue)
       {
         aRangeDecoder->m_Code = (aRangeDecoder->m_Code << 8) | aRangeDecoder->m_Stream.ReadByte();