X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fsocket.h;h=b89c175bda040d2e22b17ba3335cdefd225616bb;hb=HEAD;hp=c55a5390a673d868b51d9e52a9675fee18f79b79;hpb=e900bb4a8fe086fac55ffe51c75915be0003c5e4;p=libs%2Fnet.git

diff --git a/source/net/socket.h b/source/net/socket.h
index c55a539..b89c175 100644
--- a/source/net/socket.h
+++ b/source/net/socket.h
@@ -1,23 +1,24 @@
 #ifndef MSP_NET_SOCKET_H_
 #define MSP_NET_SOCKET_H_
 
+#include <memory>
 #include <msp/core/except.h>
 #include <msp/io/eventobject.h>
 #include <msp/io/handle.h>
-#include "constants.h"
+#include "mspnet_api.h"
 #include "sockaddr.h"
 
 namespace Msp {
 namespace Net {
 
-class bad_socket_state: public invalid_state
+class MSPNET_API bad_socket_state: public invalid_state
 {
 public:
 	bad_socket_state(const std::string &w): invalid_state(w) { }
 };
 
 
-class Socket: public IO::EventObject
+class MSPNET_API Socket: public IO::EventObject
 {
 protected:
 	enum SocketEvent
@@ -30,8 +31,8 @@ protected:
 
 	struct Private;
 
-	Private *priv = nullptr;
-	SockAddr *local_addr = nullptr;
+	std::unique_ptr<Private> priv;
+	std::unique_ptr<SockAddr> local_addr;
 
 	Socket(const Private &);
 	Socket(Family, int, int);
@@ -50,7 +51,7 @@ public:
 	users of the address. */
 	void bind(const SockAddr &);
 
-	bool is_bound() const { return local_addr; }
+	bool is_bound() const { return static_cast<bool>(local_addr); }
 	const SockAddr &get_local_address() const;
 
 	void set_timeout(const Time::TimeDelta &);