    // move out all expired timers
    std::vector<Entry> getExpired(Timestamp now);
    void reset(const std::vector<Entry>& expired, Timestamp now);
-@@ -70,9 +71,6 @@ class TimerQueue : boost::noncopyable
+@@ -75,9 +76,6 @@ class TimerQueue : boost::noncopyable
    bool insert(Timer* timer);
  
    EventLoop* loop_;

 namespace muduo
 {
@@ -60,8 +81,8 @@ inline uint16_t networkToHost16(uint16_t net16)
 #if __GNUC_MINOR__ >= 6
 #pragma GCC diagnostic pop
 #else
-#pragma GCC diagnostic error "-Wconversion"
-#pragma GCC diagnostic error "-Wold-style-cast"
+//#pragma GCC diagnostic error "-Wconversion"
+//#pragma GCC diagnostic error "-Wold-style-cast"
 #endif
 
 
diff --git a/muduo/net/EventLoop.cc b/muduo/net/EventLoop.cc
index 51dc13d..b8728ea 100644
--- a/muduo/net/EventLoop.cc
+++ b/muduo/net/EventLoop.cc
@@ -18,7 +18,8 @@

 
   std::vector<Entry> expired = getExpired(now);
 
@@ -237,11 +193,6 @@ void TimerQueue::reset(const std::vector<Entry>& expired, Timestamp now)
   {
     nextExpire = timers_.begin()->second->expiration();
   }
