C++11y allows us to eliminate some boilerplate!

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

diff --git a/rsmtest_client.cc b/rsmtest_client.cc
index cb3ce8c..e9c8001 100644 (file)
--- a/rsmtest_client.cc
+++ b/rsmtest_client.cc
@@ -3,23 +3,21 @@
 #include "rsmtest_client.h"
 #include <arpa/inet.h>
 
 #include "rsmtest_client.h"
 #include <arpa/inet.h>
 

-rsmtest_client::rsmtest_client(std::string dst) : cl(dst) {
-    if (cl.bind() < 0)
-        cout << "rsmtest_client: call bind" << endl;
+rsmtest_client::rsmtest_client(string dst) {
+    if (!(cl = rpcc::bind_cached(dst)))
+        LOG << "rsmtest_client: call bind";

 }
 
 rsm_test_protocol::status rsmtest_client::net_repair(int heal) {
 }
 
 rsm_test_protocol::status rsmtest_client::net_repair(int heal) {

-    rsm_test_protocol::status r;
-    auto ret = (rsm_test_protocol::status)cl.call(rsm_test_protocol::net_repair, r, heal);
+    rsm_test_protocol::status r = rsm_test_protocol::ERR;
+    auto ret = (rsm_test_protocol::status)cl->call(rsm_test_protocol::net_repair, r, heal);

     VERIFY (ret == rsm_test_protocol::OK);
     return r;
 }
 
 rsm_test_protocol::status rsmtest_client::breakpoint(int b) {
     VERIFY (ret == rsm_test_protocol::OK);
     return r;
 }
 
 rsm_test_protocol::status rsmtest_client::breakpoint(int b) {

-    rsm_test_protocol::status r;
-    auto ret = (rsm_test_protocol::status)cl.call(rsm_test_protocol::breakpoint, r, b);
+    rsm_test_protocol::status r = rsm_test_protocol::ERR;
+    auto ret = (rsm_test_protocol::status)cl->call(rsm_test_protocol::breakpoint, r, b);

     VERIFY (ret == rsm_test_protocol::OK);
     return r;
 }
     VERIFY (ret == rsm_test_protocol::OK);
     return r;
 }

-
-