Fixing compilation issues

2 files changed, 7 insertions, 8 deletions

diff --git a/modules/remote-filesystem/c++/remote.hpp b/modules/remote-filesystem/c++/remote.hpp
index ebd044c..c5ca397 100644
--- a/modules/remote-filesystem/c++/remote.hpp
+++ b/modules/remote-filesystem/c++/remote.hpp
@@ -68,8 +68,7 @@ public:
 	/**
 	 * Internal deregister function
 	 */
-	error_or<void> deregister_data_server(ptr<i_data_server<rmt::File>> srv){
-		std::string path = addr().get_path_string();
+	error_or<void> deregister_data_server(const std::string& path){
 		auto erase_op = registered_data_servers_.erase(path);
 		if(erase_op == 0u){
 			return make_error<err::not_found>();
@@ -157,12 +156,11 @@ public:
 	/**
 	 * Internal deregister function
 	 */
-	error_or<void> deregister_data_server(ptr<i_data_server<rmt::FileSystem>> srv){
+	error_or<void> deregister_data_server(const std::string& addr, uint32_t sch_crc32, uint32_t enc_crc32){
 		key_t k;
-		k.path = addr().get_path_string();
-		constexpr auto crc_pair = data_server<Schema,Encode,rmt::FileSystem>::class_id;
-		k.sch_crc32 = crc_pair.first;
-		k.enc_crc32 = crc_pair.second;
+		k.path = addr;
+		k.sch_crc32 = sch_crc32;
+		k.enc_crc32 = enc_crc32;
 
 		auto erase_op = registered_data_servers_.erase(k);
 		if(erase_op == 0u){
diff --git a/modules/remote-filesystem/c++/transfer.hpp b/modules/remote-filesystem/c++/transfer.hpp
index 04dc0a6..78dbc53 100644
--- a/modules/remote-filesystem/c++/transfer.hpp
+++ b/modules/remote-filesystem/c++/transfer.hpp
@@ -28,7 +28,7 @@ public:
 	{}
 
 	~data_server(){
-		remote_().deregister_data_server(*this);
+		remote_().deregister_data_server(addr_.get_path_string());
 	}
 
 	SAW_FORBID_MOVE(data_server);
@@ -101,6 +101,7 @@ public:
 
 		return dat;
 	}
+
 };
 
 template <typename Schema, typename Encoding>