Simplifications and clean-ups

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

diff --git a/handle.cc b/handle.cc
index 792ce40..17d04af 100644 (file)
--- a/handle.cc
+++ b/handle.cc
@@ -27,14 +27,14 @@ rpcc * handle::safebind() {
         return nullptr;
     if (!h->client) {
         unique_ptr<rpcc> client(new rpcc(h->destination));
         return nullptr;
     if (!h->client) {
         unique_ptr<rpcc> client(new rpcc(h->destination));

-        LOG("bind(\"" << h->destination << "\")");
+        LOG << "bind(\"" << h->destination << "\")";

         int ret = client->bind(milliseconds(1000));
         if (ret < 0) {
         int ret = client->bind(milliseconds(1000));
         if (ret < 0) {

-            LOG("bind failure! " << h->destination << " " << ret);
+            LOG << "bind failure! " << h->destination << " " << ret;

             h->valid = false;
         } else {
             h->valid = false;
         } else {

-            LOG("bind succeeded " << h->destination);
-            h->client = move(client);
+            LOG << "bind succeeded " << h->destination;
+            h->client = std::move(client);

         }
     }
     return h->client.get();
         }
     }
     return h->client.get();

@@ -45,7 +45,7 @@ void handle::invalidate() {
     lock ml(mgr_mutex);
     if (hmap.find(destination_) != hmap.end()) {
         hmap[destination_]->valid = false;
     lock ml(mgr_mutex);
     if (hmap.find(destination_) != hmap.end()) {
         hmap[destination_]->valid = false;

-        LOG_NONMEMBER("cl " << destination_ << " refcnt " << hmap[destination_].use_count());
+        LOG << "cl " << destination_ << " refcnt " << hmap[destination_].use_count();

         hmap.erase(destination_);
     }
 }
         hmap.erase(destination_);
     }
 }