From 208a5fbc7a9c99773b0467e259c8ee1266eac881 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Thu, 9 Sep 2021 13:37:18 +0200 Subject: Use runtime_exception() instead of exception() as the latter doesn't have a constructor that takes a message according to the C++20 standard --- zencore/stream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zencore/stream.cpp') diff --git a/zencore/stream.cpp b/zencore/stream.cpp index bd925ebc4..e6cb35c01 100644 --- a/zencore/stream.cpp +++ b/zencore/stream.cpp @@ -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); } -- cgit v1.2.3 From 3c73aa35898006ba7ab98ca50d329197c8ec4457 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Thu, 9 Sep 2021 13:39:02 +0200 Subject: Use sprintf() where _itoa_s() is not available --- zencore/stream.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'zencore/stream.cpp') diff --git a/zencore/stream.cpp b/zencore/stream.cpp index e6cb35c01..54bcb1f5d 100644 --- a/zencore/stream.cpp +++ b/zencore/stream.cpp @@ -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; } -- cgit v1.2.3 From 8d346a746d998330f974b022c19b7e7e19834e51 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Thu, 9 Sep 2021 13:39:59 +0200 Subject: Replaced use of "%ll?" format specifiers with PRI?64 --- zencore/stream.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'zencore/stream.cpp') diff --git a/zencore/stream.cpp b/zencore/stream.cpp index 54bcb1f5d..34fff19bb 100644 --- a/zencore/stream.cpp +++ b/zencore/stream.cpp @@ -137,7 +137,7 @@ operator<<(TextWriter& writer, int64_t value) #if ZEN_PLATFORM_WINDOWS _i64toa_s(value, buffer, sizeof buffer, 10); #else - sprintf(buffer, PRId64, value); + sprintf(buffer, "%" PRId64, value); #endif writer << buffer; return writer; @@ -189,7 +189,7 @@ operator<<(TextWriter& writer, uint64_t value) #if ZEN_PLATFORM_WINDOWS _ui64toa_s(value, buffer, sizeof buffer, 10); #else - sprintf(buffer, PRIu64, value); + sprintf(buffer, "%" PRIu64, value); #endif writer << buffer; return writer; -- cgit v1.2.3 From 1f30288a2677574d77589c326b6473da8096d774 Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Wed, 15 Sep 2021 11:38:29 +0200 Subject: Wrong include for std::runtime_error --- zencore/stream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zencore/stream.cpp') diff --git a/zencore/stream.cpp b/zencore/stream.cpp index 34fff19bb..8687d5501 100644 --- a/zencore/stream.cpp +++ b/zencore/stream.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include namespace zen { -- cgit v1.2.3