libt2n: (gerd) fixes & improvements

[libt2n] / src / t2n_exception.hxx

diff --git a/src/t2n_exception.hxx b/src/t2n_exception.hxx
index c756b09..364a194 100644 (file)
--- a/src/t2n_exception.hxx
+++ b/src/t2n_exception.hxx
@@ -22,8 +22,8 @@
 #include <stdexcept>
 #include <string>
 
+#include <boost/serialization/serialization.hpp>
 #include <boost/serialization/export.hpp>
-#include <boost/serialization/tracking.hpp>
 
 // serialization for std::exception
 namespace boost {
@@ -44,7 +44,7 @@ namespace libt2n
 class t2n_exception : public std::exception
 {
     private:
-        string message;
+        std::string message;
 
         friend class boost::serialization::access;
         template<class Archive>
@@ -55,7 +55,7 @@ class t2n_exception : public std::exception
         }
 
     public:
-        t2n_exception(const string& _message)
+        t2n_exception(const std::string& _message)
             { message=_message; }
 
         t2n_exception()
@@ -87,14 +87,14 @@ class t2n_communication_error : public t2n_exception
         }
 
     public:
-        t2n_communication_error(const string& _message)
+        t2n_communication_error(const std::string& _message)
             : t2n_exception(_message)
             { }
 
         t2n_communication_error()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_communication_error(*this); }
 
         void do_throw()
@@ -114,14 +114,14 @@ class t2n_connect_error : public t2n_communication_error
         }
 
     public:
-        t2n_connect_error(const string& _message)
+        t2n_connect_error(const std::string& _message)
             : t2n_communication_error(_message)
             { }
 
         t2n_connect_error()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_connect_error(*this); }
 
         void do_throw()
@@ -141,14 +141,14 @@ class t2n_server_error : public t2n_communication_error
         }
 
     public:
-        t2n_server_error(const string& _message)
+        t2n_server_error(const std::string& _message)
             : t2n_communication_error(_message)
             { }
 
         t2n_server_error()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_server_error(*this); }
 
         void do_throw()
@@ -168,14 +168,14 @@ class t2n_transfer_error : public t2n_communication_error
         }
 
     public:
-        t2n_transfer_error(const string& _message)
+        t2n_transfer_error(const std::string& _message)
             : t2n_communication_error(_message)
             { }
 
         t2n_transfer_error()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_transfer_error(*this); }
 
         void do_throw()
@@ -195,14 +195,14 @@ class t2n_version_mismatch : public t2n_communication_error
         }
 
     public:
-        t2n_version_mismatch(const string& _message)
+        t2n_version_mismatch(const std::string& _message)
             : t2n_communication_error(_message)
             { }
 
         t2n_version_mismatch()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_version_mismatch(*this); }
 
         void do_throw()
@@ -222,14 +222,14 @@ class t2n_command_error : public t2n_exception
         }
 
     public:
-        t2n_command_error(const string& _message)
+        t2n_command_error(const std::string& _message)
             : t2n_exception(_message)
             { }
 
         t2n_command_error()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_command_error(*this); }
 
         void do_throw()
@@ -249,14 +249,14 @@ class t2n_serialization_error : public t2n_exception
         }
 
     public:
-        t2n_serialization_error(const string& _message)
+        t2n_serialization_error(const std::string& _message)
             : t2n_exception(_message)
             { }
 
         t2n_serialization_error()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_serialization_error(*this); }
 
         void do_throw()
@@ -277,14 +277,14 @@ class t2n_runtime_error : public t2n_exception
         }
 
     public:
-        t2n_runtime_error(const string& _message)
+        t2n_runtime_error(const std::string& _message)
             : t2n_exception(_message)
             { }
 
         t2n_runtime_error()
             { }
 
-        ipc_exception* clone() const
+        t2n_exception* clone() const
             { return new t2n_runtime_error(*this); }
 
         void do_throw()