cleanup - fixed warnings, reformatting

[wxWidgets.git] / include / wx / datstrm.h

diff --git a/include/wx/datstrm.h b/include/wx/datstrm.h
index 7551c3c24b9ddf9f638f5f51ba4a242490ca0abc..f49620a6aef16bf72355c8022dd7e634784cfe68 100644 (file)
--- a/include/wx/datstrm.h
+++ b/include/wx/datstrm.h
@@ -30,14 +30,30 @@ public:
 
     bool IsOk() { return m_input->IsOk(); }
 
 
     bool IsOk() { return m_input->IsOk(); }
 

+#if wxHAS_INT64

     wxUint64 Read64();
     wxUint64 Read64();

+#endif
+#if wxUSE_LONGLONG
+    wxLongLong ReadLL();
+#endif

     wxUint32 Read32();
     wxUint16 Read16();
     wxUint8 Read8();
     double ReadDouble();
     wxString ReadString();
 
     wxUint32 Read32();
     wxUint16 Read16();
     wxUint8 Read8();
     double ReadDouble();
     wxString ReadString();
 

+#if wxHAS_INT64

     void Read64(wxUint64 *buffer, size_t size);
     void Read64(wxUint64 *buffer, size_t size);

+    void Read64(wxInt64 *buffer, size_t size);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    void Read64(wxULongLong *buffer, size_t size);
+    void Read64(wxLongLong *buffer, size_t size);
+#endif
+#if wxUSE_LONGLONG
+    void ReadLL(wxULongLong *buffer, size_t size);
+    void ReadLL(wxLongLong *buffer, size_t size);
+#endif

     void Read32(wxUint32 *buffer, size_t size);
     void Read16(wxUint16 *buffer, size_t size);
     void Read8(wxUint8 *buffer, size_t size);
     void Read32(wxUint32 *buffer, size_t size);
     void Read16(wxUint16 *buffer, size_t size);
     void Read8(wxUint8 *buffer, size_t size);


@@ -50,7 +66,14 @@ public:
     wxDataInputStream& operator>>(wxUint8& c);
     wxDataInputStream& operator>>(wxUint16& i);
     wxDataInputStream& operator>>(wxUint32& i);
     wxDataInputStream& operator>>(wxUint8& c);
     wxDataInputStream& operator>>(wxUint16& i);
     wxDataInputStream& operator>>(wxUint32& i);

+#if wxHAS_INT64

     wxDataInputStream& operator>>(wxUint64& i);
     wxDataInputStream& operator>>(wxUint64& i);

+    wxDataInputStream& operator>>(wxInt64& i);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    wxDataInputStream& operator>>(wxULongLong& i);
+    wxDataInputStream& operator>>(wxLongLong& i);
+#endif

     wxDataInputStream& operator>>(double& i);
     wxDataInputStream& operator>>(float& f);
 
     wxDataInputStream& operator>>(double& i);
     wxDataInputStream& operator>>(float& f);
 


@@ -78,14 +101,32 @@ public:
 
     bool IsOk() { return m_output->IsOk(); }
 
 
     bool IsOk() { return m_output->IsOk(); }
 

+#if wxHAS_INT64

     void Write64(wxUint64 i);
     void Write64(wxUint64 i);

+    void Write64(wxInt64 i);
+#endif
+#if wxUSE_LONGLONG
+    void WriteLL(const wxLongLong &ll);
+    void WriteLL(const wxULongLong &ll);
+#endif

     void Write32(wxUint32 i);
     void Write16(wxUint16 i);
     void Write8(wxUint8 i);
     void WriteDouble(double d);
     void WriteString(const wxString& string);
 
     void Write32(wxUint32 i);
     void Write16(wxUint16 i);
     void Write8(wxUint8 i);
     void WriteDouble(double d);
     void WriteString(const wxString& string);
 

+#if wxHAS_INT64

     void Write64(const wxUint64 *buffer, size_t size);
     void Write64(const wxUint64 *buffer, size_t size);

+    void Write64(const wxInt64 *buffer, size_t size);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    void Write64(const wxULongLong *buffer, size_t size);
+    void Write64(const wxLongLong *buffer, size_t size);
+#endif
+#if wxUSE_LONGLONG
+    void WriteLL(const wxULongLong *buffer, size_t size);
+    void WriteLL(const wxLongLong *buffer, size_t size);
+#endif

     void Write32(const wxUint32 *buffer, size_t size);
     void Write16(const wxUint16 *buffer, size_t size);
     void Write8(const wxUint8 *buffer, size_t size);
     void Write32(const wxUint32 *buffer, size_t size);
     void Write16(const wxUint16 *buffer, size_t size);
     void Write8(const wxUint8 *buffer, size_t size);


@@ -99,7 +140,14 @@ public:
     wxDataOutputStream& operator<<(wxUint8 c);
     wxDataOutputStream& operator<<(wxUint16 i);
     wxDataOutputStream& operator<<(wxUint32 i);
     wxDataOutputStream& operator<<(wxUint8 c);
     wxDataOutputStream& operator<<(wxUint16 i);
     wxDataOutputStream& operator<<(wxUint32 i);

+#if wxHAS_INT64

     wxDataOutputStream& operator<<(wxUint64 i);
     wxDataOutputStream& operator<<(wxUint64 i);

+    wxDataOutputStream& operator<<(wxInt64 i);
+#endif
+#if defined(wxLongLong_t) && wxUSE_LONGLONG
+    wxDataOutputStream& operator<<(const wxULongLong &i);
+    wxDataOutputStream& operator<<(const wxLongLong &i);
+#endif

     wxDataOutputStream& operator<<(double f);
     wxDataOutputStream& operator<<(float f);
 
     wxDataOutputStream& operator<<(double f);
     wxDataOutputStream& operator<<(float f);