X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38caaa61b154f60871cb6ec82040362762dd2dba..45681cd72dafb9d2dd45eaa44ad28e14e49b32e4:/src/common/datstrm.cpp diff --git a/src/common/datstrm.cpp b/src/common/datstrm.cpp index e0bd854d4c..f9f974012e 100644 --- a/src/common/datstrm.cpp +++ b/src/common/datstrm.cpp @@ -37,6 +37,18 @@ wxDataInputStream::~wxDataInputStream() { } +wxUint64 wxDataInputStream::Read64() +{ + wxUint64 i64; + + m_input->Read(&i64, 8); + + if (m_be_order) + return wxUINT64_SWAP_ON_LE(i64); + else + return wxUINT64_SWAP_ON_BE(i64); +} + wxUint32 wxDataInputStream::Read32() { wxUint32 i32; @@ -151,6 +163,12 @@ wxDataInputStream& wxDataInputStream::operator>>(wxUint32& i) return *this; } +wxDataInputStream& wxDataInputStream::operator>>(wxUint64& i) +{ + i = Read64(); + return *this; +} + wxDataInputStream& wxDataInputStream::operator>>(double& i) { i = ReadDouble(); @@ -176,6 +194,17 @@ wxDataOutputStream::~wxDataOutputStream() { } +void wxDataOutputStream::Write64(wxUint64 i) +{ + wxUint64 i64; + + if (m_be_order) + i64 = wxUINT64_SWAP_ON_LE(i); + else + i64 = wxUINT64_SWAP_ON_BE(i); + m_output->Write(&i64, 8); +} + void wxDataOutputStream::Write32(wxUint32 i) { wxUint32 i32; @@ -279,6 +308,12 @@ wxDataOutputStream& wxDataOutputStream::operator<<(wxUint32 i) return *this; } +wxDataOutputStream& wxDataOutputStream::operator<<(wxUint64 i) +{ + Write64(i); + return *this; +} + wxDataOutputStream& wxDataOutputStream::operator<<(double f) { WriteDouble(f);