Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile fix for --enable-stl.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2006-10-27 14:14:54 +00:00
parent 46b15bd575
commit 45c64b28ba
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/tarstrm.h
View File

@@ -148,6 +148,8 @@ private:
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// wxTarInputStream // wxTarInputStream
WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords);
class WXDLLIMPEXP_BASE wxTarInputStream : public wxArchiveInputStream class WXDLLIMPEXP_BASE wxTarInputStream : public wxArchiveInputStream
{ {
public: public:
@@ -178,7 +180,7 @@ private:
bool IsOpened() const { return m_pos != wxInvalidOffset; } bool IsOpened() const { return m_pos != wxInvalidOffset; }
wxStreamError ReadHeaders(); wxStreamError ReadHeaders();
bool ReadExtendedHeader(class wxTarHeaderRecords*& recs); bool ReadExtendedHeader(wxTarHeaderRecords*& recs);
wxString GetExtendedHeader(const wxString& key) const; wxString GetExtendedHeader(const wxString& key) const;
wxString GetHeaderPath() const; wxString GetHeaderPath() const;
@@ -193,8 +195,8 @@ private:
int m_sumType; int m_sumType;
int m_tarType; int m_tarType;
class wxTarHeaderBlock *m_hdr; class wxTarHeaderBlock *m_hdr;
class wxTarHeaderRecords *m_HeaderRecs; wxTarHeaderRecords *m_HeaderRecs;
class wxTarHeaderRecords *m_GlobalHeaderRecs; wxTarHeaderRecords *m_GlobalHeaderRecs;
DECLARE_NO_COPY_CLASS(wxTarInputStream) DECLARE_NO_COPY_CLASS(wxTarInputStream)
}; };

2
src/common/tarstrm.cpp
View File

@@ -569,8 +569,6 @@ void wxTarEntry::SetMode(int mode)
wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_) wxDECLARE_SCOPED_PTR(wxTarEntry, wxTarEntryPtr_)
wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_) wxDEFINE_SCOPED_PTR (wxTarEntry, wxTarEntryPtr_)
WX_DECLARE_STRING_HASH_MAP(wxString, wxTarHeaderRecords);
wxTarInputStream::wxTarInputStream(wxInputStream& stream, wxTarInputStream::wxTarInputStream(wxInputStream& stream,
wxMBConv& conv /*=wxConvLocal*/) wxMBConv& conv /*=wxConvLocal*/)
: wxArchiveInputStream(stream, conv) : wxArchiveInputStream(stream, conv)