Reapply wxWeakRef patch again

[wxWidgets.git] / include / wx / tarstrm.h

diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index 07fb87ba3fbf883bb2af4a638ba0d283db56d728..e405375925a7005212db242741b526835fa1cdd4 100644 (file)
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        tarstrm.h
+// Name:        wx/tarstrm.h
 // Purpose:     Streams for Tar files
 // Author:      Mike Wetherell
 // RCS-ID:      $Id$
@@ -15,6 +15,7 @@
 #if wxUSE_TARSTREAM
 
 #include "wx/archive.h"
+#include "wx/hashmap.h"
 
 
 /////////////////////////////////////////////////////////////////////////////
@@ -132,7 +133,7 @@ private:
     wxDateTime   m_ModifyTime;
     wxDateTime   m_AccessTime;
     wxDateTime   m_CreateTime;
-    wxChar       m_TypeFlag;
+    int          m_TypeFlag;
     wxString     m_LinkName;
     wxString     m_UserName;
     wxString     m_GroupName;
@@ -148,6 +149,8 @@ private:
 /////////////////////////////////////////////////////////////////////////////
 // wxTarInputStream
 
+WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords);
+
 class WXDLLIMPEXP_BASE wxTarInputStream : public wxArchiveInputStream
 {
 public:
@@ -178,7 +181,7 @@ private:
     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     wxStreamError ReadHeaders();
-    bool ReadExtendedHeader(class wxTarHeaderRecords*& recs);
+    bool ReadExtendedHeader(wxTarHeaderRecords*& recs);
 
     wxString GetExtendedHeader(const wxString& key) const;
     wxString GetHeaderPath() const;
@@ -193,8 +196,8 @@ private:
     int m_sumType;
     int m_tarType;
     class wxTarHeaderBlock *m_hdr;
-    class wxTarHeaderRecords *m_HeaderRecs;
-    class wxTarHeaderRecords *m_GlobalHeaderRecs;
+    wxTarHeaderRecords *m_HeaderRecs;
+    wxTarHeaderRecords *m_GlobalHeaderRecs;
 
     DECLARE_NO_COPY_CLASS(wxTarInputStream)
 };
@@ -277,6 +280,7 @@ private:
     char *m_extendedHdr;
     size_t m_extendedSize;
     wxString m_badfit;
+    bool m_endrecWritten;
 
     DECLARE_NO_COPY_CLASS(wxTarOutputStream)
 };