don't define comparison operators for wxString and wx[W]CharBuffer when wxUSE_STL...

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

diff --git a/src/common/stream.cpp b/src/common/stream.cpp
index f1d432eb697ca5a7925b854a3ca26aebc7bf99d3..3230417f2c9f028f25f5bdc1ae51ccb79f9b6685 100644 (file)
--- a/src/common/stream.cpp
+++ b/src/common/stream.cpp
@@ -576,10 +576,10 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
             default:
                 wxFAIL_MSG( _T("invalid seek mode") );
 
             default:
                 wxFAIL_MSG( _T("invalid seek mode") );
 

-                return wxInvalidOffset;
+                return (wxFileOffset) wxInvalidOffset;

         }
         if (diff < 0 || diff > last_access)
         }
         if (diff < 0 || diff > last_access)

-            return wxInvalidOffset;
+            return (wxFileOffset) wxInvalidOffset;

         SetIntPosition(diff);
         return diff;
     }
         SetIntPosition(diff);
         return diff;
     }


@@ -616,19 +616,19 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
             return ret_off;
     }
 
             return ret_off;
     }
 

-    return wxInvalidOffset;
+    return (wxFileOffset) wxInvalidOffset;

 }
 
 wxFileOffset wxStreamBuffer::Tell() const
 {
 }
 
 wxFileOffset wxStreamBuffer::Tell() const
 {

-    wxFileOffset pos;
+    wxFileSize_t pos;

 
     // ask the stream for position if we have a real one
     if ( m_stream )
     {
         pos = m_stream->OnSysTell();
         if ( pos == wxInvalidOffset )
 
     // ask the stream for position if we have a real one
     if ( m_stream )
     {
         pos = m_stream->OnSysTell();
         if ( pos == wxInvalidOffset )

-            return wxInvalidOffset;
+            return (wxFileOffset) wxInvalidOffset;

     }
     else // no associated stream
     {
     }
     else // no associated stream
     {


@@ -659,12 +659,12 @@ wxStreamBase::~wxStreamBase()
 
 wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
 {
 
 wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
 {

-    return wxInvalidOffset;
+    return (wxFileOffset) wxInvalidOffset;

 }
 
 wxFileOffset wxStreamBase::OnSysTell() const
 {
 }
 
 wxFileOffset wxStreamBase::OnSysTell() const
 {

-    return wxInvalidOffset;
+    return (wxFileOffset) wxInvalidOffset;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -889,7 +889,7 @@ wxFileOffset wxInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
 
 wxFileOffset wxInputStream::TellI() const
 {
 
 wxFileOffset wxInputStream::TellI() const
 {

-    wxFileOffset pos = OnSysTell();
+    wxFileSize_t pos = OnSysTell();

 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);
 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);


@@ -990,7 +990,7 @@ wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode
 
         default:
             wxFAIL_MSG( _T("invalid seek mode") );
 
         default:
             wxFAIL_MSG( _T("invalid seek mode") );

-            return wxInvalidOffset;
+            return (wxFileOffset) wxInvalidOffset;

     }
 
     if (m_currentPos > m_lastcount)
     }
 
     if (m_currentPos > m_lastcount)


@@ -1122,7 +1122,7 @@ wxFileOffset wxBufferedInputStream::SeekI(wxFileOffset pos, wxSeekMode mode)
 
 wxFileOffset wxBufferedInputStream::TellI() const
 {
 
 wxFileOffset wxBufferedInputStream::TellI() const
 {

-    wxFileOffset pos = m_i_streambuf->Tell();
+    wxFileSize_t pos = m_i_streambuf->Tell();

 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);
 
     if (pos != wxInvalidOffset)
         pos -= (m_wbacksize - m_wbackcur);