From a8900f0b26271278b8c3b574349189f90ff9f2aa Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Tue, 5 Dec 2023 14:41:24 +0100
Subject: codec: Fixed tests for codec

---
 modules/codec/c++/SConscript     |  8 ++++----
 modules/codec/c++/data.h         | 12 ++++++------
 modules/codec/c++/interface.h    |  2 +-
 modules/codec/c++/schema.h       |  4 ++--
 modules/codec/c++/simple.h       |  4 ++--
 modules/codec/c++/stream_value.h |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'modules/codec/c++')

diff --git a/modules/codec/c++/SConscript b/modules/codec/c++/SConscript
index c038d42..14e7b5c 100644
--- a/modules/codec/c++/SConscript
+++ b/modules/codec/c++/SConscript
@@ -21,18 +21,18 @@ env.headers += codec_env.headers;
 ## Shared lib
 objects_shared = []
 codec_env.add_source_files(objects_shared, codec_env.sources, shared=True);
-codec_env.library_shared = codec_env.SharedLibrary('#build/forstio-codec', [objects_shared]);
+env.library_shared = codec_env.SharedLibrary('#build/forstio-codec', [objects_shared]);
 
 ## Static lib
 objects_static = []
 codec_env.add_source_files(objects_static, codec_env.sources, shared=False);
-codec_env.library_static = codec_env.StaticLibrary('#build/forstio-codec', [objects_static]);
+env.library_static = codec_env.StaticLibrary('#build/forstio-codec', [objects_static]);
 
 # Set Alias
-env.Alias('library_codec', [codec_env.library_shared, codec_env.library_static]);
+env.Alias('library_codec', [env.library_shared, env.library_static]);
 
 env.targets += ['library_codec'];
 
 # Install
-env.Install('$prefix/lib/', [codec_env.library_shared, codec_env.library_static]);
+env.Install('$prefix/lib/', [env.library_shared, env.library_static]);
 env.Install('$prefix/include/forstio/codec/', [codec_env.headers]);
diff --git a/modules/codec/c++/data.h b/modules/codec/c++/data.h
index 237ef5a..365405f 100644
--- a/modules/codec/c++/data.h
+++ b/modules/codec/c++/data.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/core/common.h>
-#include <forstio/core/templates.h>
+#include <forstio/common.h>
+#include <forstio/templates.h>
 
 #include <cassert>
 
@@ -207,7 +207,7 @@ class data<schema::Array<T,Dim>, encode::Native> {
 
 		template<std::integral... Dims>
 		data(Dims... size_):
-			data{{size_...}}
+			data{{static_cast<std::size_t>(size_)...}}
 		{
 			static_assert(sizeof...(Dims)==Dim, "Argument size must be equal to the Dimension");
 		}
@@ -222,12 +222,12 @@ class data<schema::Array<T,Dim>, encode::Native> {
 
 		template<std::integral... Dims>
 		data<T, encode::Native>& at(Dims... i){
-			return value_.at(this->get_flat_index({i...}));
+			return value_.at(this->get_flat_index({static_cast<std::size_t>(i)...}));
 		}
 		
 		template<std::integral... Dims>
 		const data<T, encode::Native>& at(Dims... i) const {
-			return value_.at(this->get_flat_index({i...}));
+			return value_.at(this->get_flat_index({static_cast<std::size_t>(i)...}));
 		}
 		
 		std::size_t get_dim_size(std::size_t i) const {
@@ -352,7 +352,7 @@ class data<schema::Primitive<T,N>, encode::Native> {
 private:
 	typename native_data_type<schema::Primitive<T,N>>::type value_;
 public:
-	data():value_{{}}{};
+	data():value_{}{}
 	SAW_DEFAULT_COPY(data);
 	SAW_DEFAULT_MOVE(data);
 
diff --git a/modules/codec/c++/interface.h b/modules/codec/c++/interface.h
index b1422a9..89bfc26 100644
--- a/modules/codec/c++/interface.h
+++ b/modules/codec/c++/interface.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <forstio/core/error.h>
+#include <forstio/error.h>
 #include "schema.h"
 #include "data.h"
 
diff --git a/modules/codec/c++/schema.h b/modules/codec/c++/schema.h
index a8494fe..69233fa 100644
--- a/modules/codec/c++/schema.h
+++ b/modules/codec/c++/schema.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <forstio/core/common.h>
-#include <forstio/core/string_literal.h>
+#include <forstio/common.h>
+#include <forstio/string_literal.h>
 
 namespace saw {
 namespace schema {
diff --git a/modules/codec/c++/simple.h b/modules/codec/c++/simple.h
index 8760754..aff0626 100644
--- a/modules/codec/c++/simple.h
+++ b/modules/codec/c++/simple.h
@@ -3,8 +3,8 @@
 #include "data.h"
 #include "stream_value.h"
 
-#include <forstio/core/buffer.h>
-#include <forstio/core/error.h>
+#include <forstio/buffer.h>
+#include <forstio/error.h>
 
 namespace saw {
 namespace encode {
diff --git a/modules/codec/c++/stream_value.h b/modules/codec/c++/stream_value.h
index 09203cb..b5a58bd 100644
--- a/modules/codec/c++/stream_value.h
+++ b/modules/codec/c++/stream_value.h
@@ -2,8 +2,8 @@
 
 #include "schema.h"
 
-#include <forstio/core/buffer.h>
-#include <forstio/core/error.h>
+#include <forstio/buffer.h>
+#include <forstio/error.h>
 
 #include <cstdint>
 #include <cstring>
-- 
cgit v1.2.3