Hopefully fixed library names generated by wx-config for OS/2's PM port.

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

diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp
index 2c4f1466deeedd799eca2796ac94a3383a4d28f7..b661775598c3c8297cd56b1e5f793730c247c473 100644 (file)
--- a/src/common/datstrm.cpp
+++ b/src/common/datstrm.cpp
@@ -6,7 +6,7 @@
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     28/06/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

-// Licence:    wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -30,18 +30,14 @@
 
 #if wxUSE_UNICODE
 wxDataInputStream::wxDataInputStream(wxInputStream& s, wxMBConv& conv)
 
 #if wxUSE_UNICODE
 wxDataInputStream::wxDataInputStream(wxInputStream& s, wxMBConv& conv)

-  : m_input(&s), m_be_order(FALSE), m_conv(conv)
+  : m_input(&s), m_be_order(false), m_conv(conv)

 #else
 wxDataInputStream::wxDataInputStream(wxInputStream& s)
 #else
 wxDataInputStream::wxDataInputStream(wxInputStream& s)

-  : m_input(&s), m_be_order(FALSE)
+  : m_input(&s), m_be_order(false)

 #endif
 {
 }
 
 #endif
 {
 }
 

-wxDataInputStream::~wxDataInputStream()
-{
-}
-

 wxUint64 wxDataInputStream::Read64()
 {
   wxUint64 i64;
 wxUint64 wxDataInputStream::Read64()
 {
   wxUint64 i64;


@@ -269,18 +265,14 @@ wxDataInputStream& wxDataInputStream::operator>>(float& f)
 
 #if wxUSE_UNICODE
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv)
 
 #if wxUSE_UNICODE
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s, wxMBConv& conv)

-  : m_output(&s), m_be_order(FALSE), m_conv(conv)
+  : m_output(&s), m_be_order(false), m_conv(conv)

 #else
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)
 #else
 wxDataOutputStream::wxDataOutputStream(wxOutputStream& s)

-  : m_output(&s), m_be_order(FALSE)
+  : m_output(&s), m_be_order(false)

 #endif
 {
 }
 
 #endif
 {
 }
 

-wxDataOutputStream::~wxDataOutputStream()
-{
-}
-

 void wxDataOutputStream::Write64(wxUint64 i)
 {
   wxUint64 i64;
 void wxDataOutputStream::Write64(wxUint64 i)
 {
   wxUint64 i64;


@@ -343,7 +335,7 @@ void wxDataOutputStream::WriteDouble(double d)
 #if wxUSE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else
 #if wxUSE_APPLE_IEEE
   ConvertToIeeeExtended(d, (unsigned char *)buf);
 #else

-#ifndef __VMS__
+#if !defined(__VMS__) && !defined(__GNUG__)

 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
 #endif
    buf[0] = '\0';
 # pragma warning "wxDataOutputStream::WriteDouble() not using IeeeExtended - will not work!"
 #endif
    buf[0] = '\0';