From d51acfd0330b4adbdfb749e1620231bb87e71163 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Mon, 4 Mar 2019 20:15:53 -0600 Subject: [PATCH] [ox/std] Make ox_strlen return std::size --- deps/ox/src/ox/std/strops.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deps/ox/src/ox/std/strops.hpp b/deps/ox/src/ox/std/strops.hpp index 493365ca..cd4d14d1 100644 --- a/deps/ox/src/ox/std/strops.hpp +++ b/deps/ox/src/ox/std/strops.hpp @@ -20,15 +20,15 @@ constexpr char *ox_strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept { return dest; } -[[nodiscard]] constexpr int ox_strnlen(const char *str1, int maxLen) noexcept { - int len = 0; +[[nodiscard]] constexpr auto ox_strnlen(const char *str1, std::size_t maxLen) noexcept { + std::size_t len = 0; for (; len < maxLen && str1[len]; len++); return len; } template -[[nodiscard]] constexpr int ox_strlen(T str1) noexcept { - int len = 0; +[[nodiscard]] constexpr auto ox_strlen(T str1) noexcept { + std::size_t len = 0; for (; str1[len]; len++); return len; } @@ -112,7 +112,7 @@ template int total = 0; int multiplier = 1; - for (auto i = ox_strlen(str) - 1; i != -1; i--) { + for (auto i = static_cast(ox_strlen(str)) - 1; i != -1; i--) { total += (str[i] - '0') * multiplier; multiplier *= 10; }