X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/a4175b2e216a20b86cc872dea8a08005c60617a5..5a5c578e2e358a121cdb9234a6cb11c4ecfbf323:/rpc/pollmgr.cc

diff --git a/rpc/pollmgr.cc b/rpc/pollmgr.cc
index 33aeae2..023a7aa 100644
--- a/rpc/pollmgr.cc
+++ b/rpc/pollmgr.cc
@@ -1,16 +1,15 @@
+#include "types.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include "jsl_log.h"
-#include "lang/verify.h"
 #include "pollmgr.h"
-#include "lock.h"
 
 PollMgr *PollMgr::instance = NULL;
 static std::once_flag pollmgr_is_initialized;
 
-void
+static void
 PollMgrInit()
 {
 	PollMgr::instance = new PollMgr();
@@ -32,7 +31,7 @@ PollMgr::PollMgr() : pending_change_(false)
     th_ = std::thread(&PollMgr::wait_loop, this);
 }
 
-PollMgr::~PollMgr()
+PollMgr::~PollMgr() [[noreturn]]
 {
 	//never kill me!!!
 	VERIFY(0);
@@ -83,7 +82,7 @@ PollMgr::has_callback(int fd, poll_flag flag, aio_callback *c)
 }
 
 void
-PollMgr::wait_loop()
+PollMgr::wait_loop() [[noreturn]]
 {
 
 	std::vector<int> readable;