Got rid of most using directives. Ported tests to python.

[invirt/third/libt4.git] / rpc / poll_mgr.cc

diff --git a/rpc/poll_mgr.cc b/rpc/poll_mgr.cc
index 2598249..83289a8 100644 (file)
--- a/rpc/poll_mgr.cc
+++ b/rpc/poll_mgr.cc
@@ -7,6 +7,8 @@
 #include <sys/epoll.h>
 #endif
 
+using std::vector;
+
 aio_callback::~aio_callback() {}
 
 poll_mgr poll_mgr::shared_mgr;
@@ -33,7 +35,7 @@ class SelectAIO : public wait_manager {
         fd_set rfds_, wfds_;
         int highfds_;
         file_t pipe_[2];
-        mutex m_;
+        std::mutex m_;
 };
 
 #ifdef __linux__ 
@@ -196,7 +198,7 @@ void SelectAIO::wait_ready(vector<int> & readable, vector<int> & writable) {
         return;
     else if (ret < 0) {
         perror("select:");
-        IF_LEVEL(0) LOG("select_loop failure errno " << errno);
+        IF_LEVEL(0) LOG << "select_loop failure errno " << errno;
         VERIFY(0);
     }