Compile fix for --enable-stl.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h
index 07fb87ba3fbf883bb2af4a638ba0d283db56d728..0ade9f9a288d5783722cfa2939127ef250662e87 100644 (file)
--- a/include/wx/tarstrm.h
+++ b/include/wx/tarstrm.h
@@ -148,6 +148,8 @@ private:
 /////////////////////////////////////////////////////////////////////////////
 // wxTarInputStream
 
 /////////////////////////////////////////////////////////////////////////////
 // wxTarInputStream
 

+WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords);
+

 class WXDLLIMPEXP_BASE wxTarInputStream : public wxArchiveInputStream
 {
 public:
 class WXDLLIMPEXP_BASE wxTarInputStream : public wxArchiveInputStream
 {
 public:


@@ -178,7 +180,7 @@ private:
     bool IsOpened() const               { return m_pos != wxInvalidOffset; }
 
     wxStreamError ReadHeaders();
     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;
 
     wxString GetExtendedHeader(const wxString& key) const;
     wxString GetHeaderPath() const;


@@ -193,8 +195,8 @@ private:
     int m_sumType;
     int m_tarType;
     class wxTarHeaderBlock *m_hdr;
     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)
 };
 
     DECLARE_NO_COPY_CLASS(wxTarInputStream)
 };

diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp
index f3a1cec17a55214ce8ab5768d844c0c69d811f43..513ea001878cf87a92f083fc12f467a689633be2 100644 (file)
--- a/src/common/tarstrm.cpp
+++ b/src/common/tarstrm.cpp
@@ -569,8 +569,6 @@ void wxTarEntry::SetMode(int mode)
 wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_)
 wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_)
 
 wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_)
 wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_)
 

-WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords);
-

 wxTarInputStream::wxTarInputStream(wxInputStream& stream,
                                    wxMBConv& conv /*=wxConvLocal*/)
  :  wxArchiveInputStream(stream, conv)
 wxTarInputStream::wxTarInputStream(wxInputStream& stream,
                                    wxMBConv& conv /*=wxConvLocal*/)
  :  wxArchiveInputStream(stream, conv)