Fix for gcc 4.8

Whosemario · Apr 19, 2013 · 8955221 · 8955221
1 parent 1245cbc
commit 8955221
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/examples/fastcgi/fastcgi.cc b/examples/fastcgi/fastcgi.cc
@@ -12,7 +12,7 @@ struct FastCgiCodec::RecordHeader
   uint8_t unused;
 };
 
-const unsigned FastCgiCodec::kRecordHeader = sizeof(FastCgiCodec::RecordHeader);
+const unsigned FastCgiCodec::kRecordHeader = static_cast<unsigned>(sizeof(FastCgiCodec::RecordHeader));
 
 enum FcgiType
 {

diff --git a/muduo/base/Singleton.h b/muduo/base/Singleton.h
@@ -36,6 +36,8 @@ class Singleton : boost::noncopyable
   static void destroy()
   {
     typedef char T_must_be_complete_type[sizeof(T) == 0 ? -1 : 1];
+    T_must_be_complete_type dummy; (void) dummy;
+
     delete value_;
   }
 

diff --git a/muduo/base/ThreadLocal.h b/muduo/base/ThreadLocal.h
@@ -43,6 +43,7 @@ class ThreadLocal : boost::noncopyable
   {
     T* obj = static_cast<T*>(x);
     typedef char T_must_be_complete_type[sizeof(T) == 0 ? -1 : 1];
+    T_must_be_complete_type dummy; (void) dummy;
     delete obj;
   }
 

diff --git a/muduo/base/ThreadLocalSingleton.h b/muduo/base/ThreadLocalSingleton.h
@@ -41,6 +41,7 @@ class ThreadLocalSingleton : boost::noncopyable
   {
     assert(obj == t_value_);
     typedef char T_must_be_complete_type[sizeof(T) == 0 ? -1 : 1];
+    T_must_be_complete_type dummy; (void) dummy;
     delete t_value_;
     t_value_ = 0;
   }

diff --git a/muduo/net/Socket.cc b/muduo/net/Socket.cc
@@ -54,23 +54,23 @@ void Socket::setTcpNoDelay(bool on)
 {
   int optval = on ? 1 : 0;
   ::setsockopt(sockfd_, IPPROTO_TCP, TCP_NODELAY,
-               &optval, sizeof optval);
+               &optval, static_cast<socklen_t>(sizeof optval));
   // FIXME CHECK
 }
 
 void Socket::setReuseAddr(bool on)
 {
   int optval = on ? 1 : 0;
   ::setsockopt(sockfd_, SOL_SOCKET, SO_REUSEADDR,
-               &optval, sizeof optval);
+               &optval, static_cast<socklen_t>(sizeof optval));
   // FIXME CHECK
 }
 
 void Socket::setKeepAlive(bool on)
 {
   int optval = on ? 1 : 0;
   ::setsockopt(sockfd_, SOL_SOCKET, SO_KEEPALIVE,
-               &optval, sizeof optval);
+               &optval, static_cast<socklen_t>(sizeof optval));
   // FIXME CHECK
 }
 
diff --git a/muduo/net/SocketsOps.cc b/muduo/net/SocketsOps.cc
@@ -79,7 +79,7 @@ int sockets::createNonblockingOrDie()
 
 void sockets::bindOrDie(int sockfd, const struct sockaddr_in& addr)
 {
-  int ret = ::bind(sockfd, sockaddr_cast(&addr), sizeof addr);
+  int ret = ::bind(sockfd, sockaddr_cast(&addr), static_cast<socklen_t>(sizeof addr));
   if (ret < 0)
   {
     LOG_SYSFATAL << "sockets::bindOrDie";
@@ -97,7 +97,7 @@ void sockets::listenOrDie(int sockfd)
 
 int sockets::accept(int sockfd, struct sockaddr_in* addr)
 {
-  socklen_t addrlen = sizeof *addr;
+  socklen_t addrlen = static_cast<socklen_t>(sizeof *addr);
 #if VALGRIND
   int connfd = ::accept(sockfd, sockaddr_cast(addr), &addrlen);
   setNonBlockAndCloseOnExec(connfd);
@@ -141,7 +141,7 @@ int sockets::accept(int sockfd, struct sockaddr_in* addr)
 
 int sockets::connect(int sockfd, const struct sockaddr_in& addr)
 {
-  return ::connect(sockfd, sockaddr_cast(&addr), sizeof addr);
+  return ::connect(sockfd, sockaddr_cast(&addr), static_cast<socklen_t>(sizeof addr));
 }
 
 ssize_t sockets::read(int sockfd, void *buf, size_t count)
@@ -205,7 +205,7 @@ void sockets::fromIpPort(const char* ip, uint16_t port,
 int sockets::getSocketError(int sockfd)
 {
   int optval;
-  socklen_t optlen = sizeof optval;
+  socklen_t optlen = static_cast<socklen_t>(sizeof optval);
 
   if (::getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) < 0)
   {
@@ -221,7 +221,7 @@ struct sockaddr_in sockets::getLocalAddr(int sockfd)
 {
   struct sockaddr_in localaddr;
   bzero(&localaddr, sizeof localaddr);
-  socklen_t addrlen = sizeof(localaddr);
+  socklen_t addrlen = static_cast<socklen_t>(sizeof localaddr);
   if (::getsockname(sockfd, sockaddr_cast(&localaddr), &addrlen) < 0)
   {
     LOG_SYSERR << "sockets::getLocalAddr";
@@ -233,7 +233,7 @@ struct sockaddr_in sockets::getPeerAddr(int sockfd)
 {
   struct sockaddr_in peeraddr;
   bzero(&peeraddr, sizeof peeraddr);
-  socklen_t addrlen = sizeof(peeraddr);
+  socklen_t addrlen = static_cast<socklen_t>(sizeof peeraddr);
   if (::getpeername(sockfd, sockaddr_cast(&peeraddr), &addrlen) < 0)
   {
     LOG_SYSERR << "sockets::getPeerAddr";