From cfc6f8ed68f3718ffe033da2417af5190374ae0e Mon Sep 17 00:00:00 2001
From: "Claudius \"keldu\" Holeksa" <mail@keldu.de>
Date: Mon, 6 May 2024 11:42:39 +0200
Subject: Renamae rmt to storage since it's not related to remote, but locality

---
 modules/tools/.nix/derivation.nix  |  4 +---
 modules/tools/SConstruct           |  1 +
 modules/tools/c++/cli_analyzer.hpp | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'modules/tools')

diff --git a/modules/tools/.nix/derivation.nix b/modules/tools/.nix/derivation.nix
index 1c1431a..54ebb5e 100644
--- a/modules/tools/.nix/derivation.nix
+++ b/modules/tools/.nix/derivation.nix
@@ -7,9 +7,7 @@
 , forstio
 }:
 
-let
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation {
   pname = "forstio-tools";
   inherit version;
   src = ./..;
diff --git a/modules/tools/SConstruct b/modules/tools/SConstruct
index ddfd768..fa67084 100644
--- a/modules/tools/SConstruct
+++ b/modules/tools/SConstruct
@@ -51,6 +51,7 @@ env_vars.Add(
 );
 
 env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[],
+    CXX=['c++'],
     CPPDEFINES=['SAW_UNIX'],
     CXXFLAGS=['-std=c++20','-g','-Wall','-Wextra'],
     LIBS=[
diff --git a/modules/tools/c++/cli_analyzer.hpp b/modules/tools/c++/cli_analyzer.hpp
index 9a0998b..6b44987 100644
--- a/modules/tools/c++/cli_analyzer.hpp
+++ b/modules/tools/c++/cli_analyzer.hpp
@@ -27,7 +27,7 @@ struct cli_traverser {
 template<typename Schema, typename Encoding>
 struct cli_modifier {
 	codec<Schema, encode::Json> json;
-	static_assert( std::is_same_v<Encoding, encode::Native>, "Not supported" );
+	static_assert( std::is_same_v<Encoding, encode::Native<storage::Default>>, "Not supported" );
 
 	error_or<void> read(
 				std::deque<std::string>& sch_path,
@@ -186,9 +186,9 @@ error_or<void> modify_data_on_cli(bool read_mode, const std::string_view& file_p
 	data<Schema, Encoding> enc_data{std::string_view{file_data}};
 	codec<Schema, Encoding> enc_codec;
 	
-	data<Schema, encode::Native> native_data;
+	data<Schema> native_data;
 	{
-		auto eov = enc_codec.template decode<encode::Native>(enc_data, native_data);
+		auto eov = enc_codec.decode(enc_data, native_data);
 		if(eov.is_error()){
 			return eov;
 		}
@@ -196,20 +196,20 @@ error_or<void> modify_data_on_cli(bool read_mode, const std::string_view& file_p
 
 	if (read_mode) {
 		{
-			auto eov = impl::cli_traverser<Schema, encode::Native>::template traverse<impl::cli_mode::read>(sch_path, native_data, json_data);
+			auto eov = impl::cli_traverser<Schema, encode::Native<storage::Default>>::template traverse<impl::cli_mode::read>(sch_path, native_data, json_data);
 			if(eov.is_error()){
 				return eov;
 			}
 		}
 	} else {
 		{
-			auto eov = impl::cli_traverser<Schema, encode::Native>::template traverse<impl::cli_mode::write>(sch_path, native_data, json_data);
+			auto eov = impl::cli_traverser<Schema, encode::Native<storage::Default>>::template traverse<impl::cli_mode::write>(sch_path, native_data, json_data);
 			if(eov.is_error()){
 				return eov;
 			}
 		}
 		{
-			auto eov = enc_codec.template encode<encode::Native>(native_data, enc_data);
+			auto eov = enc_codec.template encode<encode::Native<storage::Default>>(native_data, enc_data);
 			if(eov.is_error()){
 				return eov;
 			}
-- 
cgit v1.2.3