Removing storage as a parameter

1 files changed, 10 insertions, 10 deletions

diff --git a/modules/remote-thread/c++/remote.hpp b/modules/remote-thread/c++/remote.hpp
index 39c64a6..280101a 100644
--- a/modules/remote-thread/c++/remote.hpp
+++ b/modules/remote-thread/c++/remote.hpp
@@ -36,7 +36,7 @@ class thread_rpc_communication_handler final {
 private:
 	std::mutex mut_;
 
-	using FunctionT = std::function<error_or<void>(rpc_server<Iface, Encoding, Storage, rmt::Thread>&)>;
+	using FunctionT = std::function<error_or<void>(rpc_server<Iface, Encoding, rmt::Thread>&)>;
 	std::deque<FunctionT> dispatches_;
 
 	// TODO Need a send + receive + erase request queue
@@ -48,12 +48,12 @@ public:
 	error_or<void> call(id<Void> dat_id){
 		std::lock_guard lock{mut_};
 
-		dispatches_.emplace_back([dat_id](rpc_server<Iface, Encoding, Storage, rmt::Thread>& srv){
+		dispatches_.emplace_back([dat_id](rpc_server<Iface, Encoding, rmt::Thread>& srv){
 			srv.template call<Lit>(dat_id);
 		});
 	}
 
-	error_or<void> run_next_dispatch(rpc_server<Iface, Encoding, Storage, rmt::Thread>& srv){
+	error_or<void> run_next_dispatch(rpc_server<Iface, Encoding, rmt::Thread>& srv){
 		std::lock_guard lock{mut_};
 		if(dispatches_.empty()){
 			return make_error<err::recoverable>("Dispatch Queue is empty");
@@ -67,19 +67,19 @@ public:
 
 }
 
-template<Iface, Encoding, Storage>
-class rpc_server<Iface, Encoding, Storage, rmt::Thread> {
+template<Iface, Encoding>
+class rpc_server<Iface, Encoding, rmt::Thread> {
 private:
-	our<impl::thread_rpc_communication_handler<Iface, Encoding, Storage>> comms_;
+	our<impl::thread_rpc_communication_handler<Iface, Encoding>> comms_;
 public:	
 };
 
-template<Iface, Encoding, Storage>
-class rpc_client<Iface, Encoding, Storage, rmt::Thread> {
+template<Iface, Encoding>
+class rpc_client<Iface, Encoding, rmt::Thread> {
 private:
-	our<impl::thread_rpc_communication_handler<Iface, Encoding, Storage>> comms_;
+	our<impl::thread_rpc_communication_handler<Iface, Encoding>> comms_;
 public:
-	rpc_client(our<impl::thread_rpc_communication_handler<Iface, Encoding, Storage>> comms__):
+	rpc_client(our<impl::thread_rpc_communication_handler<Iface, Encoding>> comms__):
 		comms_{std::move(comms__)}
 	{}
 };