From 158115c29f7ace58fb9546c93c08db380d68e29a Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sun, 12 Nov 2023 00:31:13 -0600
Subject: [PATCH] [ox] Fix most MSVC warnings

---
 deps/ox/src/ox/mc/intops.hpp | 2 +-
 deps/ox/src/ox/std/error.hpp | 4 ++--
 deps/ox/src/ox/std/fmt.hpp   | 2 +-
 deps/ox/src/ox/std/trace.hpp | 2 +-
 deps/ox/src/ox/std/uuid.hpp  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deps/ox/src/ox/mc/intops.hpp b/deps/ox/src/ox/mc/intops.hpp
index e98e86cb..adc4fa9b 100644
--- a/deps/ox/src/ox/mc/intops.hpp
+++ b/deps/ox/src/ox/mc/intops.hpp
@@ -35,7 +35,7 @@ constexpr std::size_t highestBit(I val) noexcept {
 	if constexpr(is_signed_v<I>) {
 		--shiftStart;
 	}
-	for (auto i = shiftStart; i < MaxValue<decltype(i)>; --i) {
+	for (auto i = shiftStart; i > 0; --i) {
 		const auto bitValue = (val >> i) & 1;
 		if (bitValue) {
 			highestBit = i;
diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp
index d1a2cf6f..66efd262 100644
--- a/deps/ox/src/ox/std/error.hpp
+++ b/deps/ox/src/ox/std/error.hpp
@@ -132,7 +132,7 @@ struct [[nodiscard]] Result {
 	T value;
 	Error error;
 
-	constexpr Result() noexcept: error(0) {
+	constexpr Result() noexcept: value(), error(0) {
 	}
 
 	template<typename U>
@@ -143,7 +143,7 @@ struct [[nodiscard]] Result {
 	constexpr Result(const Result<U> &&other) noexcept: value(std::move(other.value)), error(std::move(other.error)) {
 	}
 
-	constexpr Result(const Error &error) noexcept: error(error) {
+	constexpr Result(const Error &error) noexcept: value(), error(error) {
 	}
 
 	constexpr Result(const type &value, const Error &error = OxError(0)) noexcept: value(const_cast<type&>(value)), error(error) {
diff --git a/deps/ox/src/ox/std/fmt.hpp b/deps/ox/src/ox/std/fmt.hpp
index c106d270..a5bcd075 100644
--- a/deps/ox/src/ox/std/fmt.hpp
+++ b/deps/ox/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 = 0u; i < fmtSegments.size - 1; ++i) {
+	for (auto i = 0ull; 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/deps/ox/src/ox/std/trace.hpp b/deps/ox/src/ox/std/trace.hpp
index 9fc70957..9922ef4e 100644
--- a/deps/ox/src/ox/std/trace.hpp
+++ b/deps/ox/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 = 0u; i < fmtSegments.size - 1; ++i) {
+			for (auto i = 0ull; 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/deps/ox/src/ox/std/uuid.hpp b/deps/ox/src/ox/std/uuid.hpp
index f3ea2131..6647db00 100644
--- a/deps/ox/src/ox/std/uuid.hpp
+++ b/deps/ox/src/ox/std/uuid.hpp
@@ -128,7 +128,7 @@ class UUID {
 			}
 			UUID out;
 			auto valueI = 0u;
-			for (auto i = 0u; i < s.len();) {
+			for (auto i = 0ull; i < s.len();) {
 				if (s[i] == '-') {
 					++i;
 					continue;