fixed obscure compilation problem at line 139

[wxWidgets.git] / src / common / zipstrm.cpp

diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index 0eb50af0da1c246dbe2f2cbe4093532903b19b12..03abd6b1ab0683b2f3e873e42d50c0c74ecdb500 100644 (file)
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -169,7 +169,7 @@ size_t wxStoredInputStream::OnSysRead(void *buffer, size_t size)
     count = m_parent_i_stream->Read(buffer, count).LastRead();
     m_pos += count;
 
     count = m_parent_i_stream->Read(buffer, count).LastRead();
     m_pos += count;
 

-    if (m_pos == m_len)
+    if (m_pos == m_len && count < size)

         m_lasterror = wxSTREAM_EOF;
     else if (!*m_parent_i_stream)
         m_lasterror = wxSTREAM_READ_ERROR;
         m_lasterror = wxSTREAM_EOF;
     else if (!*m_parent_i_stream)
         m_lasterror = wxSTREAM_READ_ERROR;


@@ -484,6 +484,8 @@ private:
     size_t m_size;
     size_t m_capacity;
     int m_ref;
     size_t m_size;
     size_t m_capacity;
     int m_ref;

+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipMemory)

 };
 
 wxZipMemory *wxZipMemory::Unique(size_t size)
 };
 
 wxZipMemory *wxZipMemory::Unique(size_t size)


@@ -558,12 +560,14 @@ public:
     bool IsEmpty() const { return m_entries.empty(); }
 
 private:
     bool IsEmpty() const { return m_entries.empty(); }
 
 private:

-    typedef wx__OffsetZipEntryMap::key_type key_type;
-

     ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
 
     ~wxZipWeakLinks() { wxASSERT(IsEmpty()); }
 

+    typedef wx__OffsetZipEntryMap::key_type key_type;
+

     int m_ref;
     wx__OffsetZipEntryMap m_entries;
     int m_ref;
     wx__OffsetZipEntryMap m_entries;

+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipWeakLinks)

 };
 
 wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key)
 };
 
 wxZipWeakLinks *wxZipWeakLinks::AddEntry(wxZipEntry *entry, wxFileOffset key)


@@ -1170,6 +1174,8 @@ private:
 
     int m_ref;
     wxZipOutputStream *m_stream;
 
     int m_ref;
     wxZipOutputStream *m_stream;

+
+    wxSUPPRESS_GCC_PRIVATE_DTOR_WARNING(wxZipStreamLink)

 };
 
 
 };