diff options
| author | Stefan Boberg <[email protected]> | 2021-09-15 19:49:20 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-15 19:49:20 +0200 |
| commit | 83ccd52321a23c8f1c8a3228cbbf34b8f199a22b (patch) | |
| tree | 9cf1fb68651f616aef2fa28000e4f328ef9204d8 /zencore/stream.cpp | |
| parent | Added GetSize/GetData functions to reduce cognitive load and bridge the gap b... (diff) | |
| parent | Tweaked logging to streamline access, and simplified setup code for new loggers (diff) | |
| download | zen-83ccd52321a23c8f1c8a3228cbbf34b8f199a22b.tar.xz zen-83ccd52321a23c8f1c8a3228cbbf34b8f199a22b.zip | |
Merge branch 'main' into cbpackage-update
Diffstat (limited to 'zencore/stream.cpp')
| -rw-r--r-- | zencore/stream.cpp | 36 |
1 files changed, 34 insertions, 2 deletions
diff --git a/zencore/stream.cpp b/zencore/stream.cpp index bd925ebc4..8687d5501 100644 --- a/zencore/stream.cpp +++ b/zencore/stream.cpp @@ -5,7 +5,7 @@ #include <zencore/memory.h> #include <zencore/stream.h> #include <algorithm> -#include <exception> +#include <stdexcept> namespace zen { @@ -22,7 +22,7 @@ MemoryInStream::Read(void* buffer, size_t byteCount, uint64_t offset) const size_t needEnd = offset + byteCount; if (needEnd > m_Buffer.size()) - throw std::exception("read past end of file!"); // TODO: better exception + throw std::runtime_error("read past end of file!"); // TODO: better exception memcpy(buffer, m_Buffer.data() + offset, byteCount); } @@ -95,7 +95,11 @@ TextWriter& operator<<(TextWriter& writer, int8_t value) { char buffer[16]; +#if ZEN_PLATFORM_WINDOWS _itoa_s(value, buffer, 10); +#else + sprintf(buffer, "%d", value); +#endif writer << buffer; return writer; } @@ -104,7 +108,11 @@ TextWriter& operator<<(TextWriter& writer, int16_t value) { char buffer[16]; +#if ZEN_PLATFORM_WINDOWS _itoa_s(value, buffer, 10); +#else + sprintf(buffer, "%d", value); +#endif writer << buffer; return writer; } @@ -113,7 +121,11 @@ TextWriter& operator<<(TextWriter& writer, int32_t value) { char buffer[16]; +#if ZEN_PLATFORM_WINDOWS _itoa_s(value, buffer, 10); +#else + sprintf(buffer, "%d", value); +#endif writer << buffer; return writer; } @@ -122,7 +134,11 @@ TextWriter& operator<<(TextWriter& writer, int64_t value) { char buffer[32]; +#if ZEN_PLATFORM_WINDOWS _i64toa_s(value, buffer, sizeof buffer, 10); +#else + sprintf(buffer, "%" PRId64, value); +#endif writer << buffer; return writer; } @@ -131,7 +147,11 @@ TextWriter& operator<<(TextWriter& writer, uint8_t value) { char buffer[16]; +#if ZEN_PLATFORM_WINDOWS _ultoa_s(value, buffer, 10); +#else + sprintf(buffer, "%u", value); +#endif writer << buffer; return writer; } @@ -140,7 +160,11 @@ TextWriter& operator<<(TextWriter& writer, uint16_t value) { char buffer[16]; +#if ZEN_PLATFORM_WINDOWS _ultoa_s(value, buffer, 10); +#else + sprintf(buffer, "%u", value); +#endif writer << buffer; return writer; } @@ -149,7 +173,11 @@ TextWriter& operator<<(TextWriter& writer, uint32_t value) { char buffer[16]; +#if ZEN_PLATFORM_WINDOWS _ultoa_s(value, buffer, 10); +#else + sprintf(buffer, "%u", value); +#endif writer << buffer; return writer; } @@ -158,7 +186,11 @@ TextWriter& operator<<(TextWriter& writer, uint64_t value) { char buffer[32]; +#if ZEN_PLATFORM_WINDOWS _ui64toa_s(value, buffer, sizeof buffer, 10); +#else + sprintf(buffer, "%" PRIu64, value); +#endif writer << buffer; return writer; } |