1 files changed, 25 insertions, 25 deletions

diff --git a/modules/codec/c++/interface.hpp b/modules/codec/c++/interface.hpp
index 8c6808b..d55b415 100644
--- a/modules/codec/c++/interface.hpp
+++ b/modules/codec/c++/interface.hpp
@@ -8,32 +8,32 @@
 #include "data.hpp"
 
 namespace saw {
-template<typename SchemaFunc, typename Encode, typename Context = void_t >
+template<typename SchemaFunc, typename Encode, typename Storage, typename Context = void_t >
 class function;
 
 namespace impl {
-template<typename Request, typename Response, typename Encode, typename Ctx>
+template<typename Request, typename Response, typename Encode, typename Storage, typename Ctx>
 struct FuncTypeHelper {
-	using Type = std::function<data<Response, Encode>(data<Request, Encode>, Ctx)>;
+	using Type = std::function<data<Response, Encode, Storage>(data<Request, Encode, Storage>, Ctx)>;
 };
 
-template<typename Request, typename Response, typename Encode>
-struct FuncTypeHelper<Request, Response, Encode, void_t> {
-	using Type = std::function<data<Response, Encode>(data<Request, Encode>)>;
+template<typename Request, typename Response, typename Encode, typename Storage>
+struct FuncTypeHelper<Request, Response, Encode, Storage, void_t> {
+	using Type = std::function<data<Response, Encode, Storage>(data<Request, Encode, Storage>)>;
 };
 }
 
-template<typename Request, typename Response, typename Encode, typename Context>
-class function<schema::Function<Request, Response>, Encode, Context> {
+template<typename Request, typename Response, typename Encode, typename Storage, typename Context>
+class function<schema::Function<Request, Response>, Encode, Storage, Context> {
 private:
-	typename impl::FuncTypeHelper<Request, Response, Encode, Context>::Type func_;
+	typename impl::FuncTypeHelper<Request, Response, Encode, Storage, Context>::Type func_;
 public:
 	template<typename Func>
 		function(Func func):
 				func_{std::move(func)}
 		{}
 
-		error_or<data<Response, Encode>> call(data<Request, Encode> req, Context ctx = {}){
+		error_or<data<Response, Encode, Storage>> call(data<Request, Encode, Storage> req, Context ctx = {}){
 			if constexpr (std::is_same_v<Context, void_t>){
 				(void) ctx;
 				return func_(std::move(req));
@@ -43,17 +43,17 @@ public:
 		}
 };
 
-template<typename T, typename Encode, typename Context = void_t >
+template<typename T, typename Encode, typename Storage = storage::Default, typename Context = void_t >
 class interface;
 
-template<typename... Requests, typename... Responses, string_literal... Names, typename Encode, typename Context>
-class interface<schema::Interface<schema::Member<schema::Function<Requests, Responses>, Names>...>, Encode, Context> {
+template<typename... Requests, typename... Responses, string_literal... Names, typename Encode, typename Storage, typename Context>
+class interface<schema::Interface<schema::Member<schema::Function<Requests, Responses>, Names>...>, Encode, Storage, Context> {
 public:
 	using Schema = schema::Interface<schema::Member<schema::Function<Requests, Responses>,Names>...>;
 private:
-		std::tuple<function<schema::Function<Requests, Responses>, Encode, Context>...> funcs_;
+		std::tuple<function<schema::Function<Requests, Responses>, Encode, Storage, Context>...> funcs_;
 public:
-		interface(function<schema::Function<Requests, Responses>, Encode, Context>... funcs):
+		interface(function<schema::Function<Requests, Responses>, Encode, Storage, Context>... funcs):
 				funcs_{std::move(funcs)...}
 		{}
 
@@ -75,8 +75,8 @@ public:
 								>::value
 						, Responses...>::type
 				>
-		,
-				Encode
+		,		Encode
+		,		Storage
 		,		Context
 		>& get(){
 				return std::get<parameter_key_pack_index<Lit, Names...>::value>(funcs_);
@@ -90,14 +90,14 @@ public:
 								Lit, Names...
 						>::value
 				, Responses...>::type
-		, Encode>> call(
+		, Encode, Storage>> call(
 						data<
 								typename parameter_pack_type<
 										parameter_key_pack_index<
 												Lit, Names...
 										>::value
 								, Requests...>::type
-						, Encode> req,
+						, Encode, Storage> req,
 						Context ctx = {}
 				){
 				if constexpr (std::is_same_v<Context, void_t>) {
@@ -109,19 +109,19 @@ public:
 		}
 };
 
-template<typename T, typename Encode, typename Context = void_t>
+template<typename T, typename Encode, typename Storage = storage::Default, typename Context = void_t>
 struct function_factory {
 		template<typename Func>
-		static function<T,Encode, Context> create(Func func){
-				return function<T,Encode,Context> {std::move(func)};
+		static function<T,Encode, Storage, Context> create(Func func){
+				return function<T,Encode, Storage, Context> {std::move(func)};
 		}
 };
 
-template<typename T, typename Encode, typename Context = void_t>
+template<typename T, typename Encode, typename Storage = storage::Default, typename Context = void_t>
 struct interface_factory {
 		template<typename... Func>
-		static interface<T,Encode,Context> create(Func... func){
-				return interface<T,Encode,Context>{std::move(func)...};
+		static interface<T,Encode,Storage,Context> create(Func... func){
+				return interface<T,Encode,Storage,Context>{std::move(func)...};
 		}
 };
 }