Include the matching header first in .cpp files

[libs/net.git] / source / net / clientsocket.cpp

diff --git a/source/net/clientsocket.cpp b/source/net/clientsocket.cpp
index 9cabeef9c7714b7f743bf350b37c067d739714a2..fbbd2415c693911b88063f0091600d0d3e73f25a 100644 (file)
--- a/source/net/clientsocket.cpp
+++ b/source/net/clientsocket.cpp
@@ -1,21 +1,17 @@
 #include "platform_api.h"
-#include <msp/core/systemerror.h>
 #include "clientsocket.h"
+#include <msp/core/systemerror.h>
 #include "socket_private.h"
 
 namespace Msp {
 namespace Net {
 
 ClientSocket::ClientSocket(Family af, int type, int proto):
-       Socket(af, type, proto),
-       connecting(false),
-       connected(false),
-       peer_addr(0)
+       Socket(af, type, proto)
 { }
 
 ClientSocket::ClientSocket(const Private &p, const SockAddr &paddr):
        Socket(p),
-       connecting(false),
        connected(true),
        peer_addr(paddr.copy())
 { }
@@ -23,8 +19,6 @@ ClientSocket::ClientSocket(const Private &p, const SockAddr &paddr):
 ClientSocket::~ClientSocket()
 {
        signal_flush_required.emit();
-
-       delete peer_addr;
 }
 
 void ClientSocket::shutdown(IO::Mode m)
@@ -55,7 +49,7 @@ void ClientSocket::shutdown(IO::Mode m)
 
 const SockAddr &ClientSocket::get_peer_address() const
 {
-       if(peer_addr==0)
+       if(!peer_addr)
                throw bad_socket_state("not connected");
        return *peer_addr;
 }