Global destructor clean-ups and python test fixes

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

diff --git a/rpc/poll_mgr.h b/rpc/poll_mgr.h
index 44ac9f8..babf908 100644 (file)
--- a/rpc/poll_mgr.h
+++ b/rpc/poll_mgr.h
@@ -31,12 +31,13 @@ class poll_mgr {
         void del_callback(int fd, poll_flag flag);
         void block_remove_fd(int fd);
         void wait_loop();
+        void shutdown();
 
     private:
-        mutex m_;
+        std::mutex m_;
         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;