SOURCES: p7zip-c++.patch (NEW) - Fixed "extra qualification" error...

qrczak qrczak at pld-linux.org
Thu Nov 24 22:38:47 CET 2005


Author: qrczak                       Date: Thu Nov 24 21:38:47 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- Fixed "extra qualification" errors from g++
- Release 2

---- Files affected:
SOURCES:
   p7zip-c++.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/p7zip-c++.patch
diff -u /dev/null SOURCES/p7zip-c++.patch:1.1
--- /dev/null	Thu Nov 24 22:38:47 2005
+++ SOURCES/p7zip-c++.patch	Thu Nov 24 22:38:42 2005
@@ -0,0 +1,84 @@
+--- p7zip_4.29/7zip/Compress/Deflate/DeflateDecoder.h~	2005-09-22 19:53:20.000000000 +0200
++++ p7zip_4.29/7zip/Compress/Deflate/DeflateDecoder.h	2005-11-24 19:03:34.000000000 +0100
+@@ -60,7 +60,7 @@
+   void DeCodeLevelTable(Byte *newLevels, int numLevels);
+   bool ReadTables();
+   
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     ReleaseInStream();
+--- p7zip_4.29/7zip/Compress/Deflate/DeflateEncoder.h~	2005-09-22 19:53:20.000000000 +0200
++++ p7zip_4.29/7zip/Compress/Deflate/DeflateEncoder.h	2005-11-24 20:56:05.000000000 +0100
+@@ -116,7 +116,7 @@
+   void CopyBackBlockOp(UInt32 distance, UInt32 length);
+   void WriteBlockData(bool writeMode, bool finalBlock);
+ 
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     // m_MatchFinder.ReleaseStream();
+     m_OutStream.ReleaseStream();
+--- p7zip_4.29/7zip/Archive/7z/7zIn.h~	2005-09-22 19:53:23.000000000 +0200
++++ p7zip_4.29/7zip/Archive/7z/7zIn.h	2005-11-24 21:06:39.000000000 +0100
+@@ -244,7 +244,7 @@
+       CRecordVector<bool> &digestsDefined, 
+       CRecordVector<UInt32> &digests);
+ 
+-  HRESULT CInArchive::ReadStreamsInfo(
++  HRESULT ReadStreamsInfo(
+       const CObjectVector<CByteBuffer> *dataVector,
+       UInt64 &dataOffset,
+       CRecordVector<UInt64> &packSizes,
+--- p7zip_4.29/7zip/UI/Console/ExtractCallbackConsole.h~	2005-09-22 19:53:22.000000000 +0200
++++ p7zip_4.29/7zip/UI/Console/ExtractCallbackConsole.h	2005-11-24 21:18:50.000000000 +0100
+@@ -52,7 +52,7 @@
+ 
+   CStdOutStream *OutStream;
+ 
+-  void CExtractCallbackConsole::Init()
++  void Init()
+   {
+     NumArchives = 0;
+     NumArchiveErrors = 0;
+--- p7zip_4.29/7zip/Compress/Arj/ArjDecoder1.h~	2005-09-22 19:53:21.000000000 +0200
++++ p7zip_4.29/7zip/Compress/Arj/ArjDecoder1.h	2005-11-24 21:57:58.000000000 +0100
+@@ -58,7 +58,7 @@
+   UInt32 c_table[CTABLESIZE];
+   UInt32 pt_table[PTABLESIZE];
+   
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     m_InBitStream.ReleaseStream();
+--- p7zip_4.29/7zip/Compress/Arj/ArjDecoder2.h~	2005-09-22 19:53:21.000000000 +0200
++++ p7zip_4.29/7zip/Compress/Arj/ArjDecoder2.h	2005-11-24 21:58:30.000000000 +0100
+@@ -26,7 +26,7 @@
+   CLZOutWindow m_OutWindowStream;
+   NStream::NMSBF::CDecoder<CInBuffer> m_InBitStream;
+   
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     m_InBitStream.ReleaseStream();
+@@ -62,4 +62,4 @@
+ 
+ }}}
+ 
+-#endif
+\ Brak znaku nowej linii na końcu pliku
++#endif
+--- p7zip_4.29/7zip/Compress/Lzh/LzhDecoder.h~	2005-09-22 19:53:21.000000000 +0200
++++ p7zip_4.29/7zip/Compress/Lzh/LzhDecoder.h	2005-11-24 22:00:22.000000000 +0100
+@@ -53,7 +53,7 @@
+   CHuffmanDecoder<kNumDistanceSymbols> m_PHuffmanDecoder;
+   CHuffmanDecoder<kNumCSymbols> m_CHuffmanDecoder;
+ 
+-  void CCoder::ReleaseStreams()
++  void ReleaseStreams()
+   {
+     m_OutWindowStream.ReleaseStream();
+     m_InBitStream.ReleaseStream();
================================================================



More information about the pld-cvs-commit mailing list