Removing storage as a parameter

2 files changed, 11 insertions, 11 deletions

diff --git a/modules/remote/c++/transfer.hpp b/modules/remote/c++/transfer.hpp
index f68497b..5a2e2b2 100644
--- a/modules/remote/c++/transfer.hpp
+++ b/modules/remote/c++/transfer.hpp
@@ -32,14 +32,14 @@ template<typename Schema, typename Encoding, typename Remote>
 class data_client;
 
 namespace impl {
-template<typename Encoding, typename Storage, typename T>
+template<typename Encoding, typename T>
 struct data_server_redux {
 	using type = std::tuple<>;
 };
 
-template<typename Encoding, typename Storage, typename... Schema>
-struct data_server_redux<Encoding, Storage, tmpl_group<Schema...>> {
-	using type = std::tuple<std::unordered_map<uint64_t, data<Schema, Encoding, Storage>>...>;
+template<typename Encoding, typename... Schema>
+struct data_server_redux<Encoding, tmpl_group<Schema...>> {
+	using type = std::tuple<std::unordered_map<uint64_t, data<Schema, Encoding>>...>;
 };
 }
 }
diff --git a/modules/remote/c++/transfer_loopback.hpp b/modules/remote/c++/transfer_loopback.hpp
index 39ae402..bc23498 100644
--- a/modules/remote/c++/transfer_loopback.hpp
+++ b/modules/remote/c++/transfer_loopback.hpp
@@ -102,7 +102,7 @@ public:
 template<typename... Schema, typename Encoding>
 class data_server<tmpl_group<Schema...>, Encoding, rmt::Loopback> final : public i_data_server<rmt::Loopback> {
 private:
-	typename impl::data_server_redux<Encoding, storage::Default, typename tmpl_reduce<tmpl_group<Schema...>>::type>::type values_;
+	typename impl::data_server_redux<Encoding, typename tmpl_reduce<tmpl_group<Schema...>>::type>::type values_;
 
 	ptr<remote<rmt::Loopback>> remote_;
 	remote_address<rmt::Loopback> rmt_address_;
@@ -134,7 +134,7 @@ public:
 	 * Get data from client
 	 */
 	template<typename Sch>
-	error_or<void> send(const data<Sch, Encoding, storage::Default>& dat, id<Sch> store_id){
+	error_or<void> send(const data<Sch, Encoding>& dat, id<Sch> store_id){
 		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding>>>(values_);
 
 		try {
@@ -166,7 +166,7 @@ public:
 	}
 
 	template<typename Sch>
-	error_or<data<Sch, Encoding, storage::Default>> receive(id<Sch> store_id){
+	error_or<data<Sch, Encoding>> receive(id<Sch> store_id){
 		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding>>>(values_);
 
 		auto find_res = vals.find(store_id.get_value());
@@ -189,7 +189,7 @@ public:
 	}
 
 	template<typename Sch>
-	error_or<data<Sch, Encoding, storage::Default>*> find(id<Sch> store_id){
+	error_or<data<Sch, Encoding>*> find(id<Sch> store_id){
 		auto& vals = std::get<std::unordered_map<uint64_t, data<Sch,Encoding>>>(values_);
 		auto find_res = vals.find(store_id.get_value());
 		if(find_res == vals.end()){
@@ -245,7 +245,7 @@ public:
 	/**
 	 * Receive data
 	 */
-	conveyor<data<Schema, Encoding, storage::Default>> receive(id<Schema> dat_id){
+	conveyor<data<Schema, Encoding>> receive(id<Schema> dat_id){
 		auto eov = srv_().receive(dat_id);
 		if(eov.is_error()){
 			auto& err = eov.get_error();
@@ -310,7 +310,7 @@ public:
 	 * Send data to the remote.
 	 */
 	template<typename Sch>
-	error_or<id<Sch>> send(const data<Sch, Encoding, storage::Default>& dat){
+	error_or<id<Sch>> send(const data<Sch, Encoding>& dat){
 		id<Sch> dat_id{next_id_};
 		auto eov = srv_().send(dat, dat_id);
 		if(eov.is_error()){
@@ -341,7 +341,7 @@ public:
 	 * Receive data
 	 */
 	template<typename Sch>
-	conveyor<data<Sch, Encoding, storage::Default>> receive(id<Sch> dat_id){
+	conveyor<data<Sch, Encoding>> receive(id<Sch> dat_id){
 		auto eov = srv_().receive(dat_id);
 		if(eov.is_error()){
 			auto& err = eov.get_error();