X-Git-Url: http://git.tdb.fi/?p=libs%2Fnet.git;a=blobdiff_plain;f=source%2Fstreamlistensocket.cpp;h=693f3040dc85c0a81dcc1bd6b8271dea8a91f88a;hp=ccb683a1a31937b18b46db991aad021ea6b8fec8;hb=4696a776e2875697ea0d6a733609dd9c37918971;hpb=65b029e8334d4dfc9a6161fc04740b03d56a8e2f

diff --git a/source/streamlistensocket.cpp b/source/streamlistensocket.cpp
index ccb683a..693f304 100644
--- a/source/streamlistensocket.cpp
+++ b/source/streamlistensocket.cpp
@@ -1,9 +1,12 @@
 #include <cerrno>
 #include <msp/core/refptr.h>
+#include <msp/core/systemerror.h>
 #include <msp/strings/format.h>
 #include "streamlistensocket.h"
 #include "streamsocket.h"
 
+using namespace std;
+
 namespace Msp {
 namespace Net {
 
@@ -14,7 +17,8 @@ StreamListenSocket::StreamListenSocket(Family af, int proto):
 
 int StreamListenSocket::connect(const SockAddr &)
 {
-	throw Exception("Can't connect a listen socket");
+	// XXX This function needs to go away
+	throw logic_error("Can't connect a listen socket");
 }
 
 void StreamListenSocket::listen(const SockAddr &addr, unsigned backlog)
@@ -23,7 +27,7 @@ void StreamListenSocket::listen(const SockAddr &addr, unsigned backlog)
 
 	int err = ::listen(handle, backlog);
 	if(err==-1)
-		throw SystemError("Unable to listen", errno);
+		throw system_error("listen");
 
 #ifdef WIN32
 	WSAEventSelect(handle, event, FD_ACCEPT);
@@ -36,7 +40,7 @@ void StreamListenSocket::listen(const SockAddr &addr, unsigned backlog)
 StreamSocket *StreamListenSocket::accept()
 {
 	if(!listening)
-		throw InvalidState("Socket is not listening");
+		throw bad_socket_state("not listening");
 
 	sockaddr_storage sa;
 	socklen_t size = sizeof(sockaddr_storage);