From 45c64b28bad0a8a76f7cbb1413ad6d64fc71eb66 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Fri, 27 Oct 2006 14:14:54 +0000 Subject: [PATCH] Compile fix for --enable-stl. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/tarstrm.h | 8 +++++--- src/common/tarstrm.cpp | 2 -- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/wx/tarstrm.h b/include/wx/tarstrm.h index 07fb87ba3f..0ade9f9a28 100644 --- a/include/wx/tarstrm.h +++ b/include/wx/tarstrm.h @@ -148,6 +148,8 @@ private: ///////////////////////////////////////////////////////////////////////////// // wxTarInputStream +WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords); + class WXDLLIMPEXP_BASE wxTarInputStream : public wxArchiveInputStream { public: @@ -178,7 +180,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 +195,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) }; diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp index f3a1cec17a..513ea00187 100644 --- 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_) -WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords); - wxTarInputStream::wxTarInputStream(wxInputStream& stream, wxMBConv& conv /*=wxConvLocal*/) : wxArchiveInputStream(stream, conv) -- 2.45.2