Adjust exception classes and messages

[libs/net.git] / source / net / communicator.h

diff --git a/source/net/communicator.h b/source/net/communicator.h
index 63114fd9ba18cd09caa2124cca6b2119b6e1a7e8..575ec84e6c3a0f2be7ea77039041a52b919c069d 100644 (file)
--- a/source/net/communicator.h
+++ b/source/net/communicator.h
@@ -1,6 +1,7 @@
 #ifndef MSP_NET_COMMUNICATOR_H_
 #define MSP_NET_COMMUNICATOR_H_
 
+#include <msp/core/except.h>
 #include <sigc++/signal.h>
 #include "protocol.h"
 
@@ -9,18 +10,16 @@ namespace Net {
 
 class StreamSocket;
 
-class sequence_error: public std::logic_error
+class sequence_error: public invalid_state
 {
 public:
-       sequence_error(const std::string &w): std::logic_error(w) { }
-       virtual ~sequence_error() throw() { }
+       sequence_error(const std::string &w): invalid_state(w) { }
 };
 
 class incompatible_protocol: public std::runtime_error
 {
 public:
        incompatible_protocol(const std::string &w): std::runtime_error(w) { }
-       virtual ~incompatible_protocol() throw() { }
 };
 
 
@@ -35,7 +34,7 @@ private:
        const Protocol &protocol;
        ReceiverBase &receiver;
        int handshake_status;
-       unsigned buf_size;
+       std::size_t buf_size;
        char *in_buf;
        char *in_begin;
        char *in_end;
@@ -53,7 +52,7 @@ public:
        void send(const P &);
 
 private:
-       void send_data(unsigned);
+       void send_data(std::size_t);
 
        void data_available();
        bool receive_packet(const Protocol &, ReceiverBase &);