    }
  }
  
-@@ -169,11 +126,10 @@ void TimerQueue::cancelInLoop(TimerId timerId)
+@@ -174,11 +129,10 @@ void TimerQueue::cancelInLoop(TimerId timerId)
    assert(timers_.size() == activeTimers_.size());
  }
  

 
 void afterFork()
 {
diff --git a/muduo/base/TimeZone.cc b/muduo/base/TimeZone.cc
index 5fd9e28..008b931 100644
--- a/muduo/base/TimeZone.cc
+++ b/muduo/base/TimeZone.cc
@@ -8,7 +8,7 @@

 {
 
 typedef struct sockaddr SA;
 
 
 #if VALGRIND || defined (NO_ACCEPT4)
+namespace net
+{
+namespace sockets
