X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/24bebc0ecf83446c7371eff69042322aab34976a..16e7c282c6fcec8189425bd15ec9e8a4a0ee857d:/rpc/pollmgr.cc

diff --git a/rpc/pollmgr.cc b/rpc/pollmgr.cc
index 15fba26..a938284 100644
--- a/rpc/pollmgr.cc
+++ b/rpc/pollmgr.cc
@@ -6,7 +6,7 @@
 #include "pollmgr.h"
 
 PollMgr *PollMgr::instance = NULL;
-static std::once_flag pollmgr_is_initialized;
+static once_flag pollmgr_is_initialized;
 
 static void
 PollMgrInit()
@@ -17,7 +17,7 @@ PollMgrInit()
 PollMgr *
 PollMgr::Instance()
 {
-    std::call_once(pollmgr_is_initialized, PollMgrInit);
+    call_once(pollmgr_is_initialized, PollMgrInit);
     return instance;
 }
 
@@ -27,7 +27,7 @@ PollMgr::PollMgr() : pending_change_(false)
     aio_ = new SelectAIO();
     //aio_ = new EPollAIO();
 
-    th_ = std::thread(&PollMgr::wait_loop, this);
+    th_ = thread(&PollMgr::wait_loop, this);
 }
 
 PollMgr::~PollMgr() [[noreturn]]
@@ -84,8 +84,8 @@ void
 PollMgr::wait_loop() [[noreturn]]
 {
 
-    std::vector<int> readable;
-    std::vector<int> writable;
+    vector<int> readable;
+    vector<int> writable;
 
     while (1) {
         {
@@ -206,7 +206,7 @@ SelectAIO::unwatch_fd(int fd, poll_flag flag)
 }
 
 void
-SelectAIO::wait_ready(std::vector<int> *readable, std::vector<int> *writable)
+SelectAIO::wait_ready(vector<int> *readable, vector<int> *writable)
 {
     fd_set trfds, twfds;
     int high;
@@ -225,7 +225,7 @@ SelectAIO::wait_ready(std::vector<int> *readable, std::vector<int> *writable)
             return;
         } else {
             perror("select:");
-            IF_LEVEL(0) LOG("PollMgr::select_loop failure errno " << errno);
+            IF_LEVEL(0) LOG("select_loop failure errno " << errno);
             VERIFY(0);
         }
     }
@@ -334,7 +334,7 @@ EPollAIO::is_watched(int fd, poll_flag flag)
 }
 
 void
-EPollAIO::wait_ready(std::vector<int> *readable, std::vector<int> *writable)
+EPollAIO::wait_ready(vector<int> *readable, vector<int> *writable)
 {
     int nfds = epoll_wait(pollfd_, ready_, MAX_POLL_FDS, -1);
     for (int i = 0; i < nfds; i++) {