X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/eb3d5c6416c0f0d1cad35e52af3231de7866fea8..c06ef44e7af1571710fd31dd0ab068dd77b1eb2d:/rsm_client.h?ds=sidebyside

diff --git a/rsm_client.h b/rsm_client.h
index 2bdf440..90b5b06 100644
--- a/rsm_client.h
+++ b/rsm_client.h
@@ -15,8 +15,8 @@
 class rsm_client {
     protected:
         string primary;
-        vector<string> known_mems;
-        mutex rsm_client_mutex;
+        std::vector<string> known_mems;
+        std::mutex rsm_client_mutex;
         void primary_failure(lock & rsm_client_mutex_lock);
         bool init_members(lock & rsm_client_mutex_lock);
         rsm_protocol::status invoke(unsigned int proc, string & rep, const string & req);
@@ -51,17 +51,17 @@ int rsm_client::call_m(unsigned int proc, R & r, const marshall & req) {
     u >> res;
     if (!u.okdone()) {
         LOG << "failed to unmarshall the reply.";
-        LOG << "You probably forgot to set the reply string in " <<
-               "rsm::client_invoke, or you may have called RPC " <<
-               "0x" << hex << proc << " with the wrong return type";
+        LOG << "You probably forgot to set the reply string in "
+            << "rsm::client_invoke, or you may have called RPC "
+            << "0x" << std::hex << proc << " with the wrong return type";
         LOG << "here's what I got: \"" << hexify(rep) << "\"";
         VERIFY(0);
         return rpc_protocol::unmarshall_reply_failure;
     }
     if(!unmarshall(res, false, r).okdone()) {
         LOG << "failed to unmarshall the reply.";
-        LOG << "You are probably calling RPC 0x" << hex << proc <<
-               " with the wrong return type.";
+        LOG << "You are probably calling RPC 0x" << std::hex << proc
+            << " with the wrong return type.";
         LOG << "here's what I got: \"" << hexify(res) << "\"";
         VERIFY(0);
         return rpc_protocol::unmarshall_reply_failure;