64 bit clean implementation

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 50e4eb4b2e6dc2b81e1d0d76c54523258481e726..40e10fe09c11e29ff8239ee0dd00c85ae0724c99 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -92,7 +92,7 @@ double wxDataInputStream::ReadDouble()
   char buf[10];
 
   m_input->Read(buf, 10);
   char buf[10];
 
   m_input->Read(buf, 10);

-  return ConvertFromIeeeExtended((const wxInt8 *)buf);
+  return wxConvertFromIeeeExtended((const wxInt8 *)buf);

 #else
   return 0.0;
 #endif
 #else
   return 0.0;
 #endif


@@ -529,7 +529,7 @@ void wxDataOutputStream::WriteDouble(double d)
   char buf[10];
 
 #if wxUSE_APPLE_IEEE
   char buf[10];
 
 #if wxUSE_APPLE_IEEE

-  ConvertToIeeeExtended(d, (wxInt8 *)buf);
+  wxConvertToIeeeExtended(d, (wxInt8 *)buf);

 #else
 #if !defined(__VMS__) && !defined(__GNUG__)
 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
 #else
 #if !defined(__VMS__) && !defined(__GNUG__)
 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"


@@ -650,13 +650,6 @@ void wxDataOutputStream::WriteDouble(const double *buffer, size_t size)
   }
 }
 
   }
 }
 

-wxDataOutputStream& wxDataOutputStream::operator<<(const wxChar *string)
-{
-  Write32(wxStrlen(string));
-  m_output->Write((const char *)string, wxStrlen(string)*sizeof(wxChar));
-  return *this;
-}
-

 wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
 {
   WriteString(string);
 wxDataOutputStream& wxDataOutputStream::operator<<(const wxString& string)
 {
   WriteString(string);