diff options
Diffstat (limited to 'zencore/string.cpp')
| -rw-r--r-- | zencore/string.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/zencore/string.cpp b/zencore/string.cpp index 21ba5b204..8ea10d2a3 100644 --- a/zencore/string.cpp +++ b/zencore/string.cpp @@ -2,11 +2,13 @@ #include <doctest/doctest.h> #include <inttypes.h> +#include <math.h> #include <stdio.h> #include <zencore/memory.h> #include <zencore/string.h> #include <exception> #include <ostream> +#include <stdexcept> #include <utf8.h> @@ -34,14 +36,14 @@ namespace zen { bool ToString(std::span<char> Buffer, uint64_t Num) { - snprintf(Buffer.data(), Buffer.size(), "%I64u", Num); + snprintf(Buffer.data(), Buffer.size(), "%" PRIu64, Num); return true; } bool ToString(std::span<char> Buffer, int64_t Num) { - snprintf(Buffer.data(), Buffer.size(), "%I64d", Num); + snprintf(Buffer.data(), Buffer.size(), "%" PRId64, Num); return true; } @@ -231,12 +233,12 @@ NiceNumGeneral(uint64_t Num, std::span<char> Buffer, NicenumFormat Format) switch (Format) { case kNicenumRaw: - return snprintf(Buffer.data(), Buffer.size(), "%llu", (uint64_t)Num); + return snprintf(Buffer.data(), Buffer.size(), "%" PRIu64, (uint64_t)Num); case kNicenumRawTime: if (Num > 0) { - return snprintf(Buffer.data(), Buffer.size(), "%llu", (uint64_t)Num); + return snprintf(Buffer.data(), Buffer.size(), "%" PRIu64, (uint64_t)Num); } else { @@ -275,7 +277,7 @@ NiceNumGeneral(uint64_t Num, std::span<char> Buffer, NicenumFormat Format) * If this is an even multiple of the base, always display * without any decimal precision. */ - return snprintf(Buffer.data(), Buffer.size(), "%llu%s", (uint64_t)n, u); + return snprintf(Buffer.data(), Buffer.size(), "%" PRIu64 "%s", (uint64_t)n, u); } else { @@ -437,7 +439,7 @@ template<typename C> [[noreturn]] void StringBuilderImpl<C>::Fail(const char* reason) { - throw std::exception(reason); + throw std::runtime_error(reason); } // Instantiate templates once |