    // FIXME: use unique_ptr<Timer> instead of raw pointers.
 @@ -61,8 +64,6 @@ class TimerQueue : boost::noncopyable
  
-   void scheduleInLoop(Timer* timer);
+   void addTimerInLoop(Timer* timer);
    void cancelInLoop(TimerId timerId);
--  // called when timerfd arms
+-  // called when timerfd alarms
 -  void handleRead();
    // move out all expired timers
    std::vector<Entry> getExpired(Timestamp now);

 
 namespace muduo
 {
@@ -23,39 +24,37 @@ namespace sockets
 
 // the inline assembler code makes type blur,
 // so we disable warnings for a while.
-#pragma GCC diagnostic ignored "-Wconversion"
-#pragma GCC diagnostic ignored "-Wold-style-cast"
+#if __BYTE_ORDER == __LITTLE_ENDIAN

-  return be16toh(net16);
+  return bswap_16(net16);
 }
-#if __GNUC_MINOR__ >= 6
-#pragma GCC diagnostic pop
-#else
-#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
--- a/muduo/net/EventLoop.cc
+++ b/muduo/net/EventLoop.cc
@@ -18,7 +18,8 @@
 #include <boost/bind.hpp>
 
 #include <signal.h>
