From eb51ed9ae864001d16c659150d87aec72fb25333 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Tue, 17 Jan 2023 17:36:15 -0500
Subject: [PATCH] Shift ownership of initial values.

---
 Numeric/NumericCoder.hpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Numeric/NumericCoder.hpp b/Numeric/NumericCoder.hpp
index a473eaa2f..ab8d48ad8 100644
--- a/Numeric/NumericCoder.hpp
+++ b/Numeric/NumericCoder.hpp
@@ -23,19 +23,20 @@ template <int... Sizes> class NumericCoder {
 		/// Modifies @c target to hold @c value at @c index.
 		template <int index> static void encode(int &target, int value) {
 			static_assert(index < sizeof...(Sizes), "Index must be within range");
-			NumericEncoder<Sizes...>::template encode<index, 0, 1>(target, value);
+			NumericEncoder<Sizes...>::template encode<index>(target, value);
 		}
+
 		/// @returns The value from @c source at @c index.
 		template <int index> static int decode(int source) {
 			static_assert(index < sizeof...(Sizes), "Index must be within range");
-			return NumericDecoder<Sizes...>::template decode<index, 0, 1>(source);
+			return NumericDecoder<Sizes...>::template decode<index>(source);
 		}
 
 	private:
 
 		template <int size, int... Tail>
 		struct NumericEncoder {
-			template <int index, int i, int divider> static void encode(int &target, int value) {
+			template <int index, int i = 0, int divider = 1> static void encode(int &target, int value) {
 				if constexpr (i == index) {
 					const int suffix = target % divider;
 					target /= divider;
@@ -51,7 +52,7 @@ template <int... Sizes> class NumericCoder {
 
 		template <int size, int... Tail>
 		struct NumericDecoder {
-			template <int index, int i, int divider> static int decode(int source) {
+			template <int index, int i = 0, int divider = 1> static int decode(int source) {
 				if constexpr (i == index) {
 					return (source / divider) % size;
 				} else {