From 566a5abca26868e23affe71ae7d14586c31ac480 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Mon, 3 May 2021 14:52:36 -0400
Subject: [PATCH] [ox/{mc,oc}] Cleanup

(synced from d01ff63527a149bcf6876bb397ab633ae562be23)
---
 src/ox/mc/write.hpp | 6 +++---
 src/ox/oc/write.hpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ox/mc/write.hpp b/src/ox/mc/write.hpp
index 70b5c3dd1..eaf4fe9c4 100644
--- a/src/ox/mc/write.hpp
+++ b/src/ox/mc/write.hpp
@@ -11,11 +11,11 @@
 #include <ox/model/optype.hpp>
 #include <ox/model/types.hpp>
 #include <ox/std/bit.hpp>
+#include <ox/std/buffer.hpp>
 #include <ox/std/byteswap.hpp>
 #include <ox/std/string.hpp>
 #include <ox/std/types.hpp>
 #include <ox/std/units.hpp>
-#include <ox/std/vector.hpp>
 
 #include "intops.hpp"
 #include "err.hpp"
@@ -223,8 +223,8 @@ void MetalClawWriter::setTypeInfo(const char*, int fields) {
 }
 
 template<typename T>
-Result<Vector<char>> writeMC(T *val) {
-	Vector<char> buff(10 * units::MB);
+Result<Buffer> writeMC(T *val) {
+	Buffer buff(10 * units::MB);
 	MetalClawWriter writer(bit_cast<uint8_t*>(buff.data()), buff.size());
 	oxReturnError(model(&writer, val));
 	buff.resize(writer.size());
diff --git a/src/ox/oc/write.hpp b/src/ox/oc/write.hpp
index 0a7c072ca..057c08038 100644
--- a/src/ox/oc/write.hpp
+++ b/src/ox/oc/write.hpp
@@ -12,16 +12,16 @@
 
 #include <ox/model/optype.hpp>
 #include <ox/model/types.hpp>
+#include <ox/std/buffer.hpp>
 #include <ox/std/hashmap.hpp>
 #include <ox/std/string.hpp>
-#include <ox/std/vector.hpp>
 
 namespace ox {
 
 class OrganicClawWriter {
 
 	template<typename T>
-	friend Result<Vector<char>> writeOC(T *val);
+	friend Result<Buffer> writeOC(T *val);
 
 	protected:
 		Json::Value m_json;
@@ -145,12 +145,12 @@ Error OrganicClawWriter::field(const char *key, ox::HashMap<String, T> *val) {
 }
 
 template<typename T>
-Result<Vector<char>> writeOC(T *val) {
+Result<Buffer> writeOC(T *val) {
 	OrganicClawWriter writer;
 	oxReturnError(model(&writer, val));
 	Json::StreamWriterBuilder jsonBuilder;
 	auto str = Json::writeString(jsonBuilder, writer.m_json);
-	Vector<char> buff(str.size() + 1);
+	Buffer buff(str.size() + 1);
 	memcpy(buff.data(), str.c_str(), str.size() + 1);
 	return buff;
 }