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

gcc < 3.4 warns about friendless private dtors.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-11-11 08:58:27 +00:00
parent 0b9cd93cad
commit 1370b1d016
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/zipstrm.cpp
View File

@@ -470,6 +470,7 @@ class wxZipMemory
{ {
public: public:
wxZipMemory() : m_data(NULL), m_size(0), m_capacity(0), m_ref(1) { } wxZipMemory() : m_data(NULL), m_size(0), m_capacity(0), m_ref(1) { }
~wxZipMemory() { delete m_data; }
wxZipMemory *AddRef() { m_ref++; return this; } wxZipMemory *AddRef() { m_ref++; return this; }
void Release() { if (--m_ref == 0) delete this; } void Release() { if (--m_ref == 0) delete this; }
@@ -481,7 +482,6 @@ public:
wxZipMemory *Unique(size_t size); wxZipMemory *Unique(size_t size);
private: private:
~wxZipMemory() { delete m_data; }
char *m_data; char *m_data;
size_t m_size; size_t m_size;
@@ -548,6 +548,7 @@ class wxZipWeakLinks
{ {
public: public:
wxZipWeakLinks() : m_ref(1) { } wxZipWeakLinks() : m_ref(1) { }
~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
void Release(const wxZipInputStream* WXUNUSED(x)) void Release(const wxZipInputStream* WXUNUSED(x))
{ if (--m_ref == 0) delete this; } { if (--m_ref == 0) delete this; }
@@ -560,7 +561,6 @@ public:
bool IsEmpty() const { return m_entries.empty(); } bool IsEmpty() const { return m_entries.empty(); }
private: private:
~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
int m_ref; int m_ref;
_wxOffsetZipEntryMap m_entries; _wxOffsetZipEntryMap m_entries;
@@ -1144,6 +1144,7 @@ class wxZipStreamLink
{ {
public: public:
wxZipStreamLink(wxZipOutputStream *stream) : m_ref(1), m_stream(stream) { } wxZipStreamLink(wxZipOutputStream *stream) : m_ref(1), m_stream(stream) { }
~wxZipStreamLink() { }
wxZipStreamLink *AddRef() { m_ref++; return this; } wxZipStreamLink *AddRef() { m_ref++; return this; }
wxZipOutputStream *GetOutputStream() const { return m_stream; } wxZipOutputStream *GetOutputStream() const { return m_stream; }
@@ -1154,7 +1155,6 @@ public:
{ m_stream = NULL; if (--m_ref == 0) delete this; } { m_stream = NULL; if (--m_ref == 0) delete this; }
private: private:
~wxZipStreamLink() { }
int m_ref; int m_ref;
wxZipOutputStream *m_stream; wxZipOutputStream *m_stream;