From e13c6e812bfd9a7395f5c08f8da3e2cf66e8b023 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 26 Nov 2024 20:46:43 -0600 Subject: [PATCH] [ox/std] Remove raw char* CharBufferWriter constructor --- deps/ox/src/ox/mc/write.hpp | 2 +- deps/ox/src/ox/std/buffer.hpp | 3 --- deps/ox/src/ox/std/istring.hpp | 2 +- deps/ox/src/ox/std/uuid.hpp | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index 49de6764..44a18812 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -395,7 +395,7 @@ Result writeMC(auto const&val, std::size_t buffReserveSz = 2 * units::KB } Error writeMC(char *buff, std::size_t buffLen, auto const&val, std::size_t *sizeOut = nullptr) noexcept { - CharBuffWriter bw(buff, buffLen); + CharBuffWriter bw{{buff, buffLen}}; oxReturnError(writeMC(bw, val)); if (sizeOut) { *sizeOut = bw.tellp(); diff --git a/deps/ox/src/ox/std/buffer.hpp b/deps/ox/src/ox/std/buffer.hpp index 6ba9db40..4cf0fd02 100644 --- a/deps/ox/src/ox/std/buffer.hpp +++ b/deps/ox/src/ox/std/buffer.hpp @@ -105,9 +105,6 @@ class CharBuffWriter { m_buff(buff.data()) { } - explicit constexpr CharBuffWriter(char *buff, std::size_t size) noexcept: m_cap(size), m_buff(buff) { - } - constexpr ox::Error seekp(std::size_t p) noexcept { m_it = p; return {}; diff --git a/deps/ox/src/ox/std/istring.hpp b/deps/ox/src/ox/std/istring.hpp index 118e6bd1..e2142471 100644 --- a/deps/ox/src/ox/std/istring.hpp +++ b/deps/ox/src/ox/std/istring.hpp @@ -263,7 +263,7 @@ constexpr auto itoa(Integer v) noexcept { }(); ox::IString out; std::ignore = out.resize(out.cap()); - ox::CharBuffWriter w(out.data(), out.cap()); + ox::CharBuffWriter w{{out.data(), out.cap()}}; std::ignore = writeItoa(v, w); std::ignore = out.resize(w.tellp()); return out; diff --git a/deps/ox/src/ox/std/uuid.hpp b/deps/ox/src/ox/std/uuid.hpp index a22cd1a9..d6aa3b40 100644 --- a/deps/ox/src/ox/std/uuid.hpp +++ b/deps/ox/src/ox/std/uuid.hpp @@ -187,7 +187,7 @@ class UUID { constexpr UUIDStr toString() const noexcept { UUIDStr out; std::ignore = out.resize(UUIDStr::cap()); - ox::CharBuffWriter bw(out.data(), UUIDStr::cap()); + ox::CharBuffWriter bw{{out.data(), UUIDStr::cap()}}; std::ignore = toString(bw); out[UUIDStr::cap()] = 0; return out;