From 5e9634ac47b0220bf06ae28bbc569aa1a02994bf Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 26 Feb 2022 22:47:19 -0600
Subject: [PATCH] [ox/model] Cleanup template style

(synced from 329ecb3266cdb6fd8b9cb32b53c2c0d80b883831)
---
 src/ox/model/def.hpp       | 4 ++--
 src/ox/model/desctypes.hpp | 2 +-
 src/ox/model/descwrite.hpp | 6 ++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/ox/model/def.hpp b/src/ox/model/def.hpp
index 44ef4ff8f..fa1ce0aad 100644
--- a/src/ox/model/def.hpp
+++ b/src/ox/model/def.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#define oxModelBegin(modelName) template<typename T> constexpr ox::Error model(T *io, modelName *o) noexcept { io->template setTypeInfo<modelName>();
+#define oxModelBegin(modelName) constexpr ox::Error model(auto *io, modelName *o) noexcept { io->template setTypeInfo<modelName>();
 #define oxModelEnd() return OxError(0); }
 #define oxModelField(fieldName) oxReturnError(io->field(#fieldName, &o->fieldName));
 #define oxModelFieldRename(serFieldName, objFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
-#define oxModelFriend(modelName) template<typename T> friend constexpr ox::Error model(T*, modelName*) noexcept
+#define oxModelFriend(modelName) friend constexpr ox::Error model(auto*, modelName*) noexcept
diff --git a/src/ox/model/desctypes.hpp b/src/ox/model/desctypes.hpp
index 9783cfa8d..092576f26 100644
--- a/src/ox/model/desctypes.hpp
+++ b/src/ox/model/desctypes.hpp
@@ -50,7 +50,7 @@ struct DescriptorField {
 	/**
 	 * Allow for explicit copying.
 	 */
-	constexpr explicit DescriptorField(const DescriptorField &other) noexcept {
+	constexpr DescriptorField(const DescriptorField &other) noexcept {
 		type = other.type;
 		fieldName = other.fieldName;
 		subscriptLevels = other.subscriptLevels;
diff --git a/src/ox/model/descwrite.hpp b/src/ox/model/descwrite.hpp
index 4c8ea69e3..6dd7193db 100644
--- a/src/ox/model/descwrite.hpp
+++ b/src/ox/model/descwrite.hpp
@@ -206,14 +206,12 @@ Result<UniquePtr<DescriptorType>> buildTypeDef(T *val) noexcept {
 	return UniquePtr<DescriptorType>{writer.definition()};
 }
 
-template<typename T>
-Error writeTypeDef(uint8_t *buff, std::size_t buffLen, T *val, std::size_t *sizeOut = nullptr) noexcept {
+Error writeTypeDef(uint8_t *buff, std::size_t buffLen, auto *val, std::size_t *sizeOut = nullptr) noexcept {
 	oxRequire(def, buildTypeDef(val));
 	return writeType(buff, buffLen, def.get(), sizeOut);
 }
 
-template<typename T>
-Result<Buffer> writeTypeDef(T *val) noexcept {
+Result<Buffer> writeTypeDef(auto *val) noexcept {
 	Buffer buff(units::MB);
 	oxReturnError(writeTypeDef(buff.data(), buff.size(), val));
 	return std::move(buff);