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 dc42274..83289a8 100644 (file)
--- a/rpc/poll_mgr.cc
+++ b/rpc/poll_mgr.cc
@@ -7,6 +7,10 @@
 #include <sys/epoll.h>
 #endif
 
+using std::vector;
+
+aio_callback::~aio_callback() {}
+
 poll_mgr poll_mgr::shared_mgr;
 
 class wait_manager {
@@ -14,9 +18,11 @@ class wait_manager {
         virtual void watch_fd(int fd, poll_flag flag) = 0;
         virtual bool unwatch_fd(int fd, poll_flag flag) = 0;
         virtual void wait_ready(vector<int> & readable, vector<int> & writable) = 0;
-        virtual ~wait_manager() noexcept {}
+        virtual ~wait_manager() noexcept;
 };
 
+wait_manager::~wait_manager() noexcept {}
+
 class SelectAIO : public wait_manager {
     public :
         SelectAIO();
@@ -29,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__ 
@@ -192,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);
     }