X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fclientsocket.h;h=80d927a330c63847c8a9cdfe88643681dad75680;hb=HEAD;hp=0b570cd7afa634357274d620a5b8980d22f025f9;hpb=30f362b6a1257aa0a01a926de8b774fe90d4be39;p=libs%2Fnet.git

diff --git a/source/net/clientsocket.h b/source/net/clientsocket.h
index 0b570cd..80d927a 100644
--- a/source/net/clientsocket.h
+++ b/source/net/clientsocket.h
@@ -1,6 +1,7 @@
 #ifndef MSP_NET_CLIENTSOCKET_H_
 #define MSP_NET_CLIENTSOCKET_H_
 
+#include "mspnet_api.h"
 #include "socket.h"
 
 namespace Msp {
@@ -9,16 +10,16 @@ namespace Net {
 /**
 ClientSockets are used for sending and receiving data over the network.
 */
-class ClientSocket: public Socket
+class MSPNET_API ClientSocket: public Socket
 {
 public:
 	/** Emitted when the socket finishes connecting. */
 	sigc::signal<void, const std::exception *> signal_connect_finished;
 
 protected:
-	bool connecting;
-	bool connected;
-	SockAddr *peer_addr;
+	bool connecting = false;
+	bool connected = false;
+	std::unique_ptr<SockAddr> peer_addr;
 
 	ClientSocket(const Private &, const SockAddr &);
 	ClientSocket(Family, int, int);
@@ -42,8 +43,8 @@ public:
 
 	const SockAddr &get_peer_address() const;
 protected:
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
+	std::size_t do_write(const char *, std::size_t) override;
+	std::size_t do_read(char *, std::size_t) override;
 };
 
 } // namespace Net