From 38833205e4011a8a318b8dc6809621a89ad9f446 Mon Sep 17 00:00:00 2001 From: "Nicolas \"Pixel\" Noble" Date: Wed, 29 Aug 2012 23:19:09 -0700 Subject: Using true C++11 initializers in classes. --- src/Socket.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/Socket.cc') diff --git a/src/Socket.cc b/src/Socket.cc index 1c3778a..148d0a4 100644 --- a/src/Socket.cc +++ b/src/Socket.cc @@ -230,7 +230,7 @@ static DNSRequest resolveName(const char * name, const char * service = NULL, st } #endif -Balau::Socket::Socket() throw (GeneralException) : m_fd(socket(AF_INET6, SOCK_STREAM, 0)), m_connected(false), m_connecting(false), m_listening(false) { +Balau::Socket::Socket() throw (GeneralException) : m_fd(socket(AF_INET6, SOCK_STREAM, 0)) { m_name = "Socket(unconnected)"; RAssert(m_fd >= 0, "socket() returned %i", m_fd); m_evtR = new SocketEvent(m_fd, ev::READ); @@ -251,8 +251,9 @@ Balau::Socket::Socket() throw (GeneralException) : m_fd(socket(AF_INET6, SOCK_ST Printer::elog(E_SOCKET, "Creating a socket at %p", this); } -Balau::Socket::Socket(int fd) : m_fd(fd), m_connected(true), m_connecting(false), m_listening(false) { +Balau::Socket::Socket(int fd) : m_fd(fd) { socklen_t len; + m_connected = true; len = sizeof(m_localAddr); getsockname(m_fd, (sockaddr *) &m_localAddr, &len); -- cgit v1.2.3