From 9ac43d2762f4580de77be91993bac0a56340134b Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Fri, 27 Sep 2024 02:44:25 -0500
Subject: [PATCH] [ox/oc] Fix Linux build

---
 deps/nostalgia/deps/ox/src/ox/oc/write.hpp | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/deps/nostalgia/deps/ox/src/ox/oc/write.hpp b/deps/nostalgia/deps/ox/src/ox/oc/write.hpp
index 105f272..006bfd6 100644
--- a/deps/nostalgia/deps/ox/src/ox/oc/write.hpp
+++ b/deps/nostalgia/deps/ox/src/ox/oc/write.hpp
@@ -24,9 +24,8 @@ namespace ox {
 
 class OrganicClawWriter {
 
-	template<typename T>
-	friend Result<T> writeOC(const auto &val) noexcept
-		requires(ox::is_same_v<T, ox::Buffer> || ox::is_same_v<T, ox::String>);
+	friend Result<ox::Buffer> writeOC(const auto &val) noexcept;
+	friend Result<ox::String> writeOCString(const auto &val) noexcept;
 
 	protected:
 		Json::Value m_json{Json::Value(Json::objectValue)};
@@ -249,16 +248,26 @@ Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcep
 	return OxError(0);
 }
 
-template<typename T = ox::Buffer>
-Result<T> writeOC(const auto &val) noexcept
-	requires(ox::is_same_v<T, ox::Buffer> || ox::is_same_v<T, ox::String>) {
+Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	OrganicClawWriter writer;
 	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(&writer);
 	oxReturnError(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
-	Result<T> buff;
-	buff.value.resize(str.size() + ox::is_same_v<T, ox::Buffer>);
+	Result<Buffer> buff;
+	buff.value.resize(str.size() + 1);
+	memcpy(buff.value.data(), str.data(), str.size() + 1);
+	return buff;
+}
+
+Result<ox::String> writeOCString(const auto &val) noexcept {
+	OrganicClawWriter writer;
+	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(&writer);
+	oxReturnError(model(&handler, &val));
+	Json::StreamWriterBuilder const jsonBuilder;
+	const auto str = Json::writeString(jsonBuilder, writer.m_json);
+	Result<ox::String> buff;
+	buff.value.resize(str.size());
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
 	return buff;
 }