[keel] Update pack for Preloader changes

.liccor.yml

@@ -2,4 +2,4 @@
 source:
 - src
 copyright_notice: |-
-  Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.

deps/glutils/.liccor.yml

@@ -0,0 +1,6 @@
+---
+source:
+- include
+- src
+copyright_notice: |-
+  Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.

deps/glutils/include/glutils/glutils.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #pragma once
@@ -150,8 +150,39 @@ class FrameBufferBind {
 
 void bind(const FrameBuffer &fb) noexcept;
 
+struct ShaderVarSet {
+	GLsizei len{};
+	ox::String name;
+};
 
-ox::Result<GLProgram> buildShaderProgram(ox::CStringView const&vert, ox::CStringView const&frag, ox::CStringView const&geo = "") noexcept;
+struct ProgramSource {
+	ox::Vector<glutils::ShaderVarSet> const shaderParams;
+	GLsizei const rowLen = [this] {
+		GLsizei len{};
+		for (auto const&v : shaderParams) {
+			len += v.len;
+		}
+		return len;
+	}();
+	GLsizei const vboLen = rowLen * 4;
+	ox::String const vertShader{};
+	ox::String const fragShader{};
+	ox::String const geomShader{};
+};
+
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept;
+
+ox::Result<GLProgram> buildShaderProgram(
+		ox::CStringView const&vert,
+		ox::CStringView const&frag,
+		ox::CStringView const&geo = "") noexcept;
+
+void setupShaderParams(
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
+		GLsizei vertexRowLen) noexcept;
+
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept;
 
 glutils::GLVertexArray generateVertexArrayObject() noexcept;
 
@@ -160,6 +191,8 @@ glutils::GLBuffer generateBuffer() noexcept;
 [[nodiscard]]
 FrameBuffer generateFrameBuffer(int width, int height) noexcept;
 
+void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept;
+
 /**
  * Resizes a FrameBuffer, and creates if it does not already exist.
  */

deps/glutils/src/glutils.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
 #include <ox/std/assert.hpp>
@@ -88,6 +88,40 @@ static ox::Result<GLShader> buildShader(
 	return shader;
 }
 
+ox::Result<GLProgram> buildShaderProgram(ProgramSource const&src) noexcept {
+	oxRequireM(program, buildShaderProgram(
+			src.vertShader,
+			src.fragShader,
+			src.geomShader));
+	setupShaderParams(program, src.shaderParams, src.rowLen);
+	return std::move(program);
+}
+
+void setupShaderParams(
+		GLProgram const&shader,
+		ox::Vector<ShaderVarSet> const&vars,
+		GLsizei vertexRowLen) noexcept {
+	// setup vars
+	for (auto lenWritten = 0LU; auto const&v : vars) {
+		auto const attr = static_cast<GLuint>(glGetAttribLocation(shader, v.name.c_str()));
+		glEnableVertexAttribArray(attr);
+		glVertexAttribPointer(
+				attr, v.len, GL_FLOAT, GL_FALSE,
+				vertexRowLen * static_cast<GLsizei>(sizeof(float)),
+				std::bit_cast<void*>(uintptr_t{lenWritten * sizeof(float)}));
+		lenWritten += static_cast<size_t>(v.len);
+	}
+}
+
+void setupShaderParams(GLProgram const&shader, ox::Vector<ShaderVarSet> const&vars) noexcept {
+	// get row len
+	GLsizei vertexRowLen{};
+	for (auto const&v : vars) {
+		vertexRowLen += v.len;
+	}
+	setupShaderParams(shader, vars, vertexRowLen);
+}
+
 ox::Result<GLProgram> buildShaderProgram(
 		ox::CStringView const&vert,
 		ox::CStringView const&frag,
@@ -147,11 +181,7 @@ FrameBuffer generateFrameBuffer(int width, int height) noexcept {
 	return fb;
 }
 
-void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
-	if (!fb) {
-		fb = generateFrameBuffer(width, height);
-		return;
-	}
+void resizeFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	width = ox::max(1, width);
 	height = ox::max(1, height);
 	fb.width = width;
@@ -171,6 +201,14 @@ void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
 	glBindRenderbuffer(GL_RENDERBUFFER, 0);
 }
 
+void resizeInitFrameBuffer(FrameBuffer &fb, int width, int height) noexcept {
+	if (!fb) {
+		fb = generateFrameBuffer(width, height);
+		return;
+	}
+	resizeFrameBuffer(fb, width, height);
+}
+
 void resizeInitFrameBuffer(FrameBuffer &fb, ox::Size const&sz) noexcept {
 	resizeInitFrameBuffer(fb, sz.width, sz.height);
 }

deps/ox/src/ox/clargs/clargs.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/string.hpp>

deps/ox/src/ox/clargs/clargs.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/claw/claw.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/claw/format.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/claw/read.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/readclaw.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <cstdio>

deps/ox/src/ox/claw/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/claw/write.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "write.hpp"

deps/ox/src/ox/claw/write.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/event/event.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/event/signal.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "signal.hpp"

deps/ox/src/ox/event/signal.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/event/test/tests.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #undef NDEBUG

deps/ox/src/ox/fs/filestore/filestoretemplate.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "filestoretemplate.hpp"

deps/ox/src/ox/fs/filestore/filestoretemplate.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/filesystem/directory.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "directory.hpp"

deps/ox/src/ox/fs/filesystem/directory.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/filesystem/filelocation.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/model/modelops.hpp>
@@ -88,6 +88,32 @@ FileAddress &FileAddress::operator=(FileAddress &&other) noexcept {
 	return *this;
 }
 
+bool FileAddress::operator==(FileAddress const&other) const noexcept {
+	if (m_type != other.m_type) {
+		auto const aIsPath =
+				m_type == FileAddressType::Path || m_type == FileAddressType::ConstPath;
+		auto const bIsPath =
+				other.m_type == FileAddressType::Path || other.m_type == FileAddressType::ConstPath;
+		if (!(aIsPath && bIsPath)) {
+			return false;
+		}
+	}
+	switch (m_type) {
+		case FileAddressType::ConstPath:
+		case FileAddressType::Path: {
+			auto const a = getPath();
+			auto const b = other.getPath();
+			return (other.m_type == FileAddressType::ConstPath || other.m_type == FileAddressType::Path)
+			    && (a.value == b.value);
+		}
+		case FileAddressType::Inode:
+			return m_data.inode == other.m_data.inode;
+		case FileAddressType::None:
+			return true;
+	}
+	return true;
+}
+
 bool FileAddress::operator==(CRStringView path) const noexcept {
 	auto [p, err] = getPath();
 	if (err) {

deps/ox/src/ox/fs/filesystem/filelocation.hpp

@@ -22,6 +22,9 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
+template<typename T>
+constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
+
 class FileAddress {
 
 	template<typename T>
@@ -67,6 +70,8 @@ class FileAddress {
 
 		FileAddress &operator=(FileAddress &&other) noexcept;
 
+		bool operator==(const FileAddress &other) const noexcept;
+
 		bool operator==(CRStringView path) const noexcept;
 
 		[[nodiscard]]
@@ -89,12 +94,12 @@ class FileAddress {
 			}
 		}
 
-		constexpr Result<ox::StringView> getPath() const noexcept {
+		constexpr Result<ox::CStringView> getPath() const noexcept {
 			switch (m_type) {
 				case FileAddressType::Path:
-					return ox::StringView(m_data.path);
+					return ox::CStringView(m_data.path);
 				case FileAddressType::ConstPath:
-					return ox::StringView(m_data.constPath);
+					return ox::CStringView(m_data.constPath);
 				default:
 					return OxError(1);
 			}

deps/ox/src/ox/fs/filesystem/filesystem.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/error.hpp>

deps/ox/src/ox/fs/filesystem/filesystem.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/filesystem/passthroughfs.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/error.hpp>

deps/ox/src/ox/fs/filesystem/passthroughfs.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/filesystem/pathiterator.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <ox/std/memops.hpp>

deps/ox/src/ox/fs/filesystem/pathiterator.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/filesystem/types.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/fs.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/ptrarith/ptr.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/fs/test/tests.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 // make sure asserts are enabled for the test file

deps/ox/src/ox/fs/tool.cpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include <cstdio>

deps/ox/src/ox/logconn/def.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/logconn/logconn.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/err.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/mc/intops.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/mc/mc.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/mc/presenceindicator.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "err.hpp"

deps/ox/src/ox/mc/presenceindicator.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/mc/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/mc/types.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/mc/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/def.hpp

@@ -13,5 +13,5 @@
 #define oxModelBegin(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith<modelName> auto *o) noexcept { oxReturnError(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 oxModelFieldRename(objFieldName, serFieldName) oxReturnError(io->field(#serFieldName, &o->objFieldName));
 #define oxModelFriend(modelName) friend constexpr ox::Error model(auto*, ox::CommonPtrWith<modelName> auto*) noexcept

deps/ox/src/ox/model/descread.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/model/desctypes.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "desctypes.hpp"

deps/ox/src/ox/model/descwrite.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/fieldcounter.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/metadata.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/model/modelhandleradaptor.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/modelops.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/model/modelvalue.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -334,7 +334,12 @@ consteval bool isVector(const ModelValueVector*) noexcept {
 	return true;
 }
 
+constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept;
+constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept;
+
+
 class ModelObject {
+	friend constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept;
 	public:
 		struct Field {
 			String name;
@@ -517,7 +522,7 @@ class ModelUnion {
 			String name;
 			ModelValue value;
 		};
-		oxModelFriend(ModelUnion);
+		friend constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept;
 		friend ModelValue;
 		Vector<UniquePtr<Field>> m_fieldsOrder;
 		HashMap<String, Field*> m_fields;
@@ -755,7 +760,7 @@ constexpr std::size_t alignOf(const ModelValue &t) noexcept {
 			size = PlatSpec::alignOf(t.get<int64_t>());
 			break;
 		case ModelValue::Type::String:
-			size = PlatSpec::alignOf(t.get<ox::String>());
+			size = alignOf<PlatSpec>(t.get<ox::String>());
 			break;
 		case ModelValue::Type::Object:
 			size = alignOf<PlatSpec>(t.get<ox::ModelObject>());

deps/ox/src/ox/model/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/typenamecatcher.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/types.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/model/walk.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/oc/oc.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/oc/read.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/oc/test/tests.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/oc/write.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -27,7 +27,7 @@ class OrganicClawWriter {
 	friend Result<Buffer> writeOC(const auto &val) noexcept;
 
 	protected:
-		Json::Value m_json;
+		Json::Value m_json{Json::Value(Json::objectValue)};
 		Json::ArrayIndex m_fieldIt = 0;
 		int m_unionIdx = -1;
 
@@ -215,7 +215,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 		OrganicClawWriter w;
 		ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{&w};
 		oxReturnError(model(&handler, val));
-		if (!w.m_json.isNull()) {
+		if (!w.m_json.empty() || m_json.isArray()) {
 			value(key) = w.m_json;
 		}
 	}

deps/ox/src/ox/preloader/alignmentcatcher.hpp

@@ -1,5 +1,9 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2015 - 2022 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/preloader/platspecs.hpp

@@ -1,10 +1,15 @@
 /*
- * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2015 - 2022 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
 
 #include <ox/std/serialize.hpp>
+#include <ox/std/string.hpp>
 #include <ox/std/typetraits.hpp>
 
 #include "alignmentcatcher.hpp"
@@ -47,7 +52,7 @@ constexpr std::size_t alignOf(const T &v) noexcept {
 		typename PlatSpec::PtrType p = 0;
 		return PlatSpec::alignOf(p);
 	} else {
-		AlignmentCatcher<NativePlatSpec> c;
+		AlignmentCatcher<PlatSpec> c;
 		oxAssert(model(c.interface(), &v), "Could not get alignment for type");
 		return c.biggestAlignment;
 	}

deps/ox/src/ox/preloader/preloader.cpp

@@ -1,5 +1,9 @@
 /*
- * Copyright 2016 - 2022 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2015 - 2022 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "preloader.hpp"

deps/ox/src/ox/preloader/preloader.hpp

@@ -1,5 +1,9 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2015 - 2022 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once
@@ -10,10 +14,12 @@
 #include <ox/std/error.hpp>
 #include <ox/std/memops.hpp>
 #include <ox/std/memory.hpp>
+#include <ox/std/string.hpp>
 #include <ox/std/types.hpp>
 #include <ox/std/typetraits.hpp>
 #include <ox/std/units.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
+#include <ox/model/modelvalue.hpp>
 
 #include "platspecs.hpp"
 
@@ -101,9 +107,9 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>, OpType::Reflect> {
 		template<typename T>
 		constexpr ox::Error field(CRStringView, const T **val, std::size_t cnt) noexcept;
 
-		constexpr ox::Result<std::size_t> startAlloc(std::size_t sz) noexcept;
+		constexpr ox::Result<std::size_t> startAlloc(size_t sz, size_t align) noexcept;
 
-		constexpr ox::Result<std::size_t> startAlloc(std::size_t sz, std::size_t restore) noexcept;
+		constexpr ox::Result<std::size_t> startAlloc(size_t sz, size_t align, std::size_t restore) noexcept;
 
 		constexpr ox::Error endAlloc() noexcept;
 
@@ -165,14 +171,16 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView name, const T *val)
 	}
 	oxReturnError(pad(val));
 	if constexpr(ox::is_integral_v<T>) {
-		//oxDebugf("Preloader::field(name, val): {}", name);
 		return ox::serialize(&m_writer, PlatSpec::correctEndianness(*val));
 	} else if constexpr(ox::is_pointer_v<T>) {
-		const PtrType a = startAlloc(sizeOf<PlatSpec>(*val), m_writer.tellp()) + PlatSpec::RomStart;
+		const PtrType a = startAlloc(sizeOf<PlatSpec>(val), alignOf<PlatSpec>(*val), m_writer.tellp()) + PlatSpec::RomStart;
 		oxReturnError(field(name, *val));
 		oxReturnError(endAlloc());
 		return ox::serialize(&m_writer, PlatSpec::correctEndianness(a));
-	} else if constexpr(ox::isVector_v<T> || ox::is_same_v<T, ox::ModelValueVector>) {
+	} else if constexpr(ox::isVector_v<T>) {
+		return fieldVector(name, val);
+	} else if constexpr(ox::is_same_v<T, ox::ModelValueVector>) {
+		val->types();
 		return fieldVector(name, val);
 	} else {
 		m_unionIdx.emplace_back(-1);
@@ -218,6 +226,7 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView name, const ox::Arra
 	if (!unionCheckAndIt()) {
 		return {};
 	}
+	oxReturnError(pad(&(*val)[0]));
 	// serialize the Array elements
 	if constexpr(sz) {
 		m_unionIdx.emplace_back(-1);
@@ -235,27 +244,36 @@ constexpr ox::Error Preloader<PlatSpec>::field(CRStringView, const T **val, std:
 	if (!unionCheckAndIt()) {
 		return {};
 	}
+	if (cnt) {
+		oxReturnError(pad(*val));
 		// serialize the array
 		m_unionIdx.emplace_back(-1);
 		for (std::size_t i = 0; i < cnt; ++i) {
 			oxReturnError(this->interface()->field(nullptr, &val[i]));
 		}
 		m_unionIdx.pop_back();
+	}
 	return {};
 }
 
 template<typename PlatSpec>
-constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(std::size_t sz) noexcept {
-	oxRequire(a, ox::allocate(&m_writer, sz));
+constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(size_t sz, size_t align) noexcept {
 	m_allocStack.emplace_back(static_cast<typename PlatSpec::PtrType>(m_writer.tellp()));
+	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
+	const auto padding = m_writer.tellp() % align;
+	oxRequireM(a, ox::allocate(&m_writer, sz + padding));
+	a += padding;
 	oxReturnError(m_writer.seekp(a));
 	return a;
 }
 
 template<typename PlatSpec>
-constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(std::size_t sz, std::size_t restore) noexcept {
-	oxRequire(a, ox::allocate(&m_writer, sz));
+constexpr ox::Result<std::size_t> Preloader<PlatSpec>::startAlloc(std::size_t sz, size_t align, std::size_t restore) noexcept {
 	m_allocStack.emplace_back(restore, ox::ios_base::beg);
+	oxReturnError(m_writer.seekp(0, ox::ios_base::end));
+	const auto padding = m_writer.tellp() % align;
+	oxRequireM(a, ox::allocate(&m_writer, sz + padding));
+	a += padding;
 	oxReturnError(m_writer.seekp(a));
 	return a;
 }
@@ -327,7 +345,11 @@ constexpr ox::Error Preloader<PlatSpec>::fieldVector(
 	// serialize the Vector elements
 	if (val->size()) {
 		const auto sz = sizeOf<PlatSpec>(&(*val)[0]) * val->size();
-		oxRequire(p, ox::allocate(&m_writer, sz));
+		const auto align = alignOf<PlatSpec>((*val)[0]);
+		oxReturnError(m_writer.seekp(0, ox::ios_base::end));
+		const auto padding = m_writer.tellp() % align;
+		oxRequireM(p, ox::allocate(&m_writer, sz + padding));
+		p += padding;
 		oxReturnError(m_writer.seekp(p));
 		m_unionIdx.emplace_back(-1);
 		for (std::size_t i = 0; i < val->size(); ++i) {

deps/ox/src/ox/preloader/sizecatcher.hpp

@@ -1,5 +1,9 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2015 - 2022 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/preloader/unionsizecatcher.hpp

@@ -1,5 +1,9 @@
 /*
- * Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ * Copyright 2015 - 2022 gary@drinkingtea.net
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/algorithm.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/array.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/assert.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "stacktrace.hpp"

deps/ox/src/ox/std/assert.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/basestringview.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/std/bit.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "bit.hpp"

deps/ox/src/ox/std/bit.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/bounds.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/bstring.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/buffer.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "error.hpp"

deps/ox/src/ox/std/buffer.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/buildinfo.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 namespace ox::buildinfo {

deps/ox/src/ox/std/buildinfo.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 namespace ox::buildinfo {

deps/ox/src/ox/std/byteswap.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "byteswap.hpp"

deps/ox/src/ox/std/byteswap.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/cstringview.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/std/cstrops.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/std/def.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/defer.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/defines.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/error.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/std/fmt.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "fmt.hpp"

deps/ox/src/ox/std/fmt.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/hardware.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/hashmap.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this

deps/ox/src/ox/std/heapmgr.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "assert.hpp"

deps/ox/src/ox/std/heapmgr.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "types.hpp"

deps/ox/src/ox/std/initializerlist.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/iterator.hpp

@@ -1,9 +1,9 @@
 /*
- * Copyright 2015 - 2023 gary@drinkingtea.net
+ * Copyright 2015 - 2022 gary@drinkingtea.net
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/math.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "math.hpp"

deps/ox/src/ox/std/math.hpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #pragma once

deps/ox/src/ox/std/memops.cpp

@@ -3,7 +3,7 @@
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
 #include "types.hpp"