From b1d94782db7d4bdc5828b72f7e44678f0a6a0fa1 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Mon, 12 Oct 2020 21:00:01 -0500
Subject: [PATCH] [ox/std] Add Error's m_i to copy operator and constructor
---
deps/ox/src/ox/std/error.hpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp
index 553b2b5e..17902dad 100644
--- a/deps/ox/src/ox/std/error.hpp
+++ b/deps/ox/src/ox/std/error.hpp
@@ -23,7 +23,7 @@ struct [[nodiscard]] Error {
uint16_t line = 0;
uint64_t m_i = 0;
- constexpr Error(uint64_t i = 0) {
+ explicit constexpr Error(uint64_t i = 0) {
m_i = i;
}
@@ -31,12 +31,14 @@ struct [[nodiscard]] Error {
msg = o.msg;
file = o.file;
line = o.line;
+ m_i = o.m_i;
}
constexpr Error &operator=(const Error &o) noexcept {
msg = o.msg;
file = o.file;
line = o.line;
+ m_i = o.m_i;
return *this;
}
@@ -46,7 +48,7 @@ struct [[nodiscard]] Error {
};
-static constexpr Error _error(const char *file, uint32_t line, uint64_t errCode, const char *msg = nullptr) {
+constexpr Error _error(const char *file, uint32_t line, uint64_t errCode, const char *msg = nullptr) {
auto err = static_cast<ox::Error>(errCode);
err.file = file;
err.line = line;