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

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

diff --git a/rpc/poll_mgr.h b/rpc/poll_mgr.h
index bd451cf..d8cfd20 100644 (file)
--- a/rpc/poll_mgr.h
+++ b/rpc/poll_mgr.h
@@ -17,7 +17,7 @@ class aio_callback {
     public:
         virtual void read_cb(int fd) = 0;
         virtual void write_cb(int fd) = 0;
     public:
         virtual void read_cb(int fd) = 0;
         virtual void write_cb(int fd) = 0;

-        virtual ~aio_callback() {}
+        virtual ~aio_callback();

 };
 
 class poll_mgr {
 };
 
 class poll_mgr {

@@ -33,10 +33,10 @@ class poll_mgr {
         void wait_loop();
 
     private:
         void wait_loop();
 
     private:

-        mutex m_;
+        std::mutex m_;

         cond changedone_c_;
 
         cond changedone_c_;
 

-        map<int, aio_callback *> callbacks_;
+        std::map<int, aio_callback *> callbacks_;

         unique_ptr<class wait_manager> aio_;
         bool pending_change_=false, shutdown_=false;
 
         unique_ptr<class wait_manager> aio_;
         bool pending_change_=false, shutdown_=false;