From cd0958c691524e2747c2d8fb841bd3618865a3e0 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 9 Dec 2023 00:49:03 -0600 Subject: [PATCH] [ox] Cleanup some const_casts --- deps/ox/src/ox/mc/write.hpp | 2 +- deps/ox/src/ox/std/error.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index 4e955464..cc905c35 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -301,7 +301,7 @@ constexpr Error MetalClawWriter::field(const char*, const T *val, std::s oxReturnError(handler.template setTypeInfo("List", 0, {}, static_cast(len))); // write the array for (std::size_t i = 0; i < len; i++) { - oxReturnError(handler.field("", const_cast(&val[i]))); + oxReturnError(handler.field("", &val[i])); } oxReturnError(writer.finalize()); fieldSet = true; diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp index d85cde60..79b24723 100644 --- a/deps/ox/src/ox/std/error.hpp +++ b/deps/ox/src/ox/std/error.hpp @@ -144,10 +144,10 @@ struct [[nodiscard]] Result { constexpr Result(const Error &error) noexcept: value(), error(error) { } - constexpr Result(const type &value, const Error &error = OxError(0)) noexcept: value(const_cast(value)), error(error) { + constexpr Result(const type &value, const Error &error = OxError(0)) noexcept: value(value), error(error) { } - constexpr Result(type &&value, const Error &error = OxError(0)) noexcept: value(ox::forward(value)), error(error) { + constexpr Result(type &&value, const Error &error = OxError(0)) noexcept: value(std::move(value)), error(error) { } constexpr ~Result() noexcept = default;