Split out marshall code into a new file

[invirt/third/libt4.git] / lock_client.cc

diff --git a/lock_client.cc b/lock_client.cc
index 22e57f1..99dcb5b 100644 (file)
--- a/lock_client.cc
+++ b/lock_client.cc
@@ -1,14 +1,8 @@
 // RPC stubs for clients to talk to lock_server, and cache the locks.
 
 #include "lock_client.h"
-#include "rpc/rpc.h"
-#include <algorithm>
-#include "threaded_log.h"
 #include <arpa/inet.h>
 
-#include "rsm_client.h"
-#include "lock.h"
-
 void lock_state::wait(lock & mutex_lock) {
     auto self = std::this_thread::get_id();
     c[self].wait(mutex_lock);
@@ -42,7 +36,7 @@ lock_client::lock_client(string xdst, class lock_release_user *_lu) : lu(_lu), n
 
     srandom((uint32_t)time(NULL)^last_port);
     rlock_port = ((random()%32000) | (0x1 << 10));
-    id = "127.0.0.1:" + std::to_string(rlock_port);
+    id = "127.0.0.1:" + to_string(rlock_port);
     last_port = rlock_port;
     rpcs *rlsrpc = new rpcs(rlock_port);
     rlsrpc->reg(rlock_protocol::revoke, &lock_client::revoke_handler, this);