Use _get_timezone() function instead of _timezone with MSVC8+.

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

diff --git a/src/common/mstream.cpp b/src/common/mstream.cpp
index 24252d273c5e9871cf22cb19bb6d090c5d2663f2..66af403e2f8140fe46874da4ddd3dcf8902f4cd1 100644 (file)
--- a/src/common/mstream.cpp
+++ b/src/common/mstream.cpp
@@ -47,7 +47,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxMemoryInputStream, wxInputStream)
 wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
 {
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
 wxMemoryInputStream::wxMemoryInputStream(const void *data, size_t len)
 {
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);

-    m_i_streambuf->SetBufferIO((void *)data, len); // const_cast
+    m_i_streambuf->SetBufferIO(const_cast<void *>(data), len);

     m_i_streambuf->SetIntPosition(0); // seek to start pos
     m_i_streambuf->Fixed(true);
 
     m_i_streambuf->SetIntPosition(0); // seek to start pos
     m_i_streambuf->Fixed(true);
 


@@ -65,7 +65,7 @@ wxMemoryInputStream::wxMemoryInputStream(const wxMemoryOutputStream& stream)
     }
 
     const size_t len = wx_truncate_cast(size_t, lenFile);
     }
 
     const size_t len = wx_truncate_cast(size_t, lenFile);

-    wxASSERT_MSG( len == lenFile + size_t(0), _T("huge files not supported") );
+    wxASSERT_MSG( len == lenFile + size_t(0), wxT("huge files not supported") );

 
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer
 
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer


@@ -89,7 +89,7 @@ wxMemoryInputStream::InitFromStream(wxInputStream& stream, wxFileOffset lenFile)
     }
 
     const size_t len = wx_truncate_cast(size_t, lenFile);
     }
 
     const size_t len = wx_truncate_cast(size_t, lenFile);

-    wxASSERT_MSG( (wxFileOffset)len == lenFile, _T("huge files not supported") );
+    wxASSERT_MSG( (wxFileOffset)len == lenFile, wxT("huge files not supported") );

 
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer
 
     m_i_streambuf = new wxStreamBuffer(wxStreamBuffer::read);
     m_i_streambuf->SetBufferIO(len); // create buffer


@@ -194,7 +194,7 @@ wxFileOffset wxMemoryOutputStream::OnSysTell() const
 
 size_t wxMemoryOutputStream::CopyTo(void *buffer, size_t len) const
 {
 
 size_t wxMemoryOutputStream::CopyTo(void *buffer, size_t len) const
 {

-    wxCHECK_MSG( buffer, 0, _T("must have buffer to CopyTo") );
+    wxCHECK_MSG( buffer, 0, wxT("must have buffer to CopyTo") );

 
     if ( len > GetSize() )
         len = GetSize();
 
     if ( len > GetSize() )
         len = GetSize();