From dd344394c0831453ec66298a99414deb56db9d3d Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Sun, 24 Mar 2024 22:56:37 +0100
Subject: codec: Debugging

---
 modules/codec/c++/forst.tmpl.hpp | 14 ++++++--------
 modules/codec/tests/forst.cpp    | 15 ++++++++++++---
 modules/core/c++/buffer.hpp      |  5 ++---
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/modules/codec/c++/forst.tmpl.hpp b/modules/codec/c++/forst.tmpl.hpp
index bfcafae..6b2f74a 100644
--- a/modules/codec/c++/forst.tmpl.hpp
+++ b/modules/codec/c++/forst.tmpl.hpp
@@ -31,14 +31,13 @@ public:
 template<typename... Members>
 struct forst_codec_info<schema::Struct<Members...> > {
 public:
-	template<uint64_t i>
-	static uint64_t max_layers() constexpr noexcept {
+	static uint64_t max_layers(uint64_t i) constexpr noexcept {
 		if constexpr ( i < sizeof...(Members) ) {
 			using MT = typename parameter_pack_type<i, Members...>::type;
 
 			constexpr uint64_t layer_i = forst_codec_info<typename MT::Type>::layers;
 
-			constexpr uint64_t layer_next = max_layers<i+1u>();
+			constexpr uint64_t layer_next = max_layers(i+1u);
 
 			constexpr uint64_t layer_val = layer_i > layer_next ? layer_i : layer_next;
 
@@ -47,20 +46,19 @@ public:
 		return 0u;
 	}
 public:
-	static constexpr uint64_t layers = max_layers<0>();
+	static constexpr uint64_t layers = max_layers(0u);
 };
 
 template<typename... T>
 struct forst_codec_info<schema::Tuple<T...>> {
 public:
-	template<uint64_t i>
-	static uint64_t max_layers() constexpr noexcept {
+	static uint64_t max_layers(uint64_t i) constexpr noexcept {
 		if constexpr ( i < sizeof...(Members) ) {
 			using MT = typename parameter_pack_type<i, T...>::type;
 
 			constexpr uint64_t layer_i = forst_codec_info<MT>::layers;
 
-			constexpr uint64_t layer_next = max_layers<i+1u>();
+			constexpr uint64_t layer_next = max_layers(i+1u);
 
 			constexpr uint64_t layer_val = layer_i > layer_next ? layer_i : layer_next;
 
@@ -69,7 +67,7 @@ public:
 		return 0u;
 	}
 public:
-	static constexpr uint64_t layers = max_layers<0>();
+	static constexpr uint64_t layers = max_layers(0u);
 };
 }
 }
diff --git a/modules/codec/tests/forst.cpp b/modules/codec/tests/forst.cpp
index cb0442d..96c4dd0 100644
--- a/modules/codec/tests/forst.cpp
+++ b/modules/codec/tests/forst.cpp
@@ -21,9 +21,18 @@ using TestArray = Array<
 SAW_TEST("Codec Forst Info"){
 	using namespace saw;
 
-	SAW_EXPECT(impl::forst_codec_info<schema::UInt64>::layers == 0, "Layer info is wrong");
-	SAW_EXPECT(impl::forst_codec_info<TestStruct>::layers == 1, "Layer info is wrong");
-	SAW_EXPECT(impl::forst_codec_info<TestArray>::layers == 2, "Layer info is wrong");
+	{
+		uint64_t depth = impl::forst_codec_info<schema::UInt64>::layers;
+		SAW_EXPECT(depth == 0, "Layer info is wrong");
+	}
+	{
+		uint64_t depth = impl::forst_codec_info<TestStruct>::layers;
+		SAW_EXPECT(depth == 1, "Layer info is wrong");
+	}
+	{
+		uint64_t depth = impl::forst_codec_info<TestArray>::layers;
+		SAW_EXPECT(depth == 2, "Layer info is wrong");
+	}
 }
 }
 }
diff --git a/modules/core/c++/buffer.hpp b/modules/core/c++/buffer.hpp
index 92e8e7d..f62e7ad 100644
--- a/modules/core/c++/buffer.hpp
+++ b/modules/core/c++/buffer.hpp
@@ -14,10 +14,9 @@ namespace saw {
  * Access class to reduce templated BufferSegments bloat
  */
 class buffer {
-protected:
-	~buffer() = default;
-
 public:
+	~buffer() = default;
+	
 	virtual size_t read_position() const = 0;
 	virtual size_t read_composite_length() const = 0;
 	virtual size_t read_segment_length(size_t offset = 0) const = 0;
-- 
cgit v1.2.3