From 75cfd19041b2bb842b49c0de94b0df9f8e0196ff Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 12 Nov 2023 00:41:47 -0600 Subject: [PATCH] [ox/std] 32 bit system fixes (synced from d9b676d1b29205e23ad3778feec5e76909eed000) --- src/ox/std/fmt.hpp | 2 +- src/ox/std/trace.hpp | 2 +- src/ox/std/uuid.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ox/std/fmt.hpp b/src/ox/std/fmt.hpp index a5bcd075d..1a4e4e1e4 100644 --- a/src/ox/std/fmt.hpp +++ b/src/ox/std/fmt.hpp @@ -193,7 +193,7 @@ constexpr StringType sfmt(StringView fmt, Args... args) noexcept { const auto &firstSegment = fmtSegments.segments[0]; oxIgnoreError(out.append(firstSegment.str, firstSegment.length)); const detail::FmtArg elements[sizeof...(args)] = {args...}; - for (auto i = 0ull; i < fmtSegments.size - 1; ++i) { + for (size_t i = 0; i < fmtSegments.size - 1; ++i) { out += elements[i].out; const auto &s = fmtSegments.segments[i + 1]; oxIgnoreError(out.append(s.str, s.length)); diff --git a/src/ox/std/trace.hpp b/src/ox/std/trace.hpp index 9922ef4ed..13a3e66ee 100644 --- a/src/ox/std/trace.hpp +++ b/src/ox/std/trace.hpp @@ -151,7 +151,7 @@ class OutStream { const auto &firstSegment = fmtSegments.segments[0]; oxIgnoreError(m_msg.msg.append(firstSegment.str, firstSegment.length)); //const detail::FmtArg elements[sizeof...(args)] = {args...}; - for (auto i = 0ull; i < fmtSegments.size - 1; ++i) { + for (size_t i = 0; i < fmtSegments.size - 1; ++i) { m_msg.msg += elements[i].out; const auto &s = fmtSegments.segments[i + 1]; oxIgnoreError(m_msg.msg.append(s.str, s.length)); diff --git a/src/ox/std/uuid.hpp b/src/ox/std/uuid.hpp index 6647db00b..707aa3413 100644 --- a/src/ox/std/uuid.hpp +++ b/src/ox/std/uuid.hpp @@ -128,7 +128,7 @@ class UUID { } UUID out; auto valueI = 0u; - for (auto i = 0ull; i < s.len();) { + for (size_t i = 0; i < s.len();) { if (s[i] == '-') { ++i; continue;