1 files changed, 13 insertions, 13 deletions

diff --git a/modules/remote/c++/remote.hpp b/modules/remote/c++/remote.hpp
index 571a4e7..807213e 100644
--- a/modules/remote/c++/remote.hpp
+++ b/modules/remote/c++/remote.hpp
@@ -14,13 +14,13 @@ namespace saw {
 /**
  * This class acts as a helper for rpc calls and representing data on the remote.
  */
-template<typename T, typename Encoding, typename Storage>
+template<typename T, typename Encoding>
 class data_or_id {
 private:
 	/**
 	 * Variant representing the either id or data class.
 	 */
-	std::variant<id<T>, data<T,Encoding, Storage>> doi_;
+	std::variant<id<T>, data<T,Encoding>> doi_;
 public:
 	/**
 	 * Constructor for instantiating.
@@ -32,7 +32,7 @@ public:
 	/**
 	 * Constructor for instantiating.
 	 */
-	data_or_id(data<T,Encoding, Storage> val):
+	data_or_id(data<T,Encoding> val):
 		doi_{std::move(val)}
 	{}
 
@@ -47,7 +47,7 @@ public:
 	 * Check if this class holds data.
 	 */
 	bool is_data() const {
-		return std::holds_alternative<data<T,Encoding,Storage>>(doi_);
+		return std::holds_alternative<data<T,Encoding>>(doi_);
 	}
 
 	/**
@@ -60,15 +60,15 @@ public:
 	/**
 	 * Return a data reference.
 	 */
-	data<T,Encoding, Storage>& get_data(){
-		return std::get<data<T,Encoding, Storage>>(doi_);
+	data<T,Encoding>& get_data(){
+		return std::get<data<T,Encoding>>(doi_);
 	}
 
 	/**
 	 * Return a data reference.
 	 */
-	const data<T,Encoding,Storage>& get_data() const {
-		return std::get<data<T,Encoding,Storage>>(doi_);
+	const data<T,Encoding>& get_data() const {
+		return std::get<data<T,Encoding>>(doi_);
 	}
 };
 
@@ -76,21 +76,21 @@ public:
 /**
  * Representing data on the remote
  */
-template<typename T, typename Encoding, typename Storage, typename Remote>
+template<typename T, typename Encoding, typename Remote>
 class remote_data;
 
-template<typename Iface, typename Encoding, typename Storage, typename Remote>
+template<typename Iface, typename Encoding, typename Remote>
 class rpc_client;
 
 /**
  * Implementation of a remote server on the backend
  */
-template<typename Iface, typename Encoding, typename Storage, typename Remote>
+template<typename Iface, typename Encoding, typename Remote>
 class rpc_server {
 private:
-	interface<Iface, Encoding, Storage> iface_;
+	interface<Iface, Encoding> iface_;
 public:
-	rpc_server(interface<Iface, Encoding, Storage> iface):
+	rpc_server(interface<Iface, Encoding> iface):
 		iface_{std::move(iface)}
 	{}
 };