Update libtest.

[awesomized/libmemcached] / libtest / fatal.hpp

diff --git a/libtest/fatal.hpp b/libtest/fatal.hpp
index 6ac62b775f84b224ce0673cea507b2e8a3f43f3f..bb8cc938364b95076a3ed2ca038d43d65a4dbd21 100644 (file)
--- a/libtest/fatal.hpp
+++ b/libtest/fatal.hpp
@@ -53,45 +53,55 @@
 
 namespace libtest {
 
-class exception : public std::runtime_error
+class fatal : std::runtime_error
 {
 public:
-  exception(const char *, int, const char *);
+  fatal(const char *file, int line, const char *func, const char *format, ...);
 
-  int line() const
+  const char* what() const throw()
   {
-    return _line;
+    return _error_message;
   }
 
-  const char*  file() const
+  const char* mesg() const throw()
   {
-    return _file;
+    return _error_message;
   }
 
-  const char* func() const
+  // The following are just for unittesting the exception class
+  static bool is_disabled();
+  static void disable();
+  static void enable();
+  static uint32_t disabled_counter();
+  static void increment_disabled_counter();
+
+  int line()
   {
-    return _func;
+    return _line;
   }
 
-  const char* mesg() const throw()
+  const char*  file()
   {
-    return _error_message;
+    return _file;
   }
 
-
-protected:
-  char _error_message[BUFSIZ];
+  const char* func()
+  {
+    return _func;
+  }
 
 private:
-  const char*  _file;
+  char _error_message[BUFSIZ];
+  char _mesg[BUFSIZ];
   int _line;
+  const char*  _file;
   const char* _func;
 };
 
-class fatal : public exception
+class disconnected : std::runtime_error
 {
 public:
-  fatal(const char *file, int line, const char *func, const char *format, ...);
+  disconnected(const char *file, int line, const char *func, const std::string&, const in_port_t port, const char *format, ...);
 
   const char* what() const throw()
   {
@@ -105,51 +115,28 @@ public:
   static uint32_t disabled_counter();
   static void increment_disabled_counter();
 
-private:
-};
-
-class disconnected : public exception
-{
-public:
-  disconnected(const char *file, int line, const char *func, const std::string&, const in_port_t port, const char *format, ...);
-
-  const char* what() const throw()
+  int line()
   {
-    return _error_message;
+    return _line;
   }
 
-  // The following are just for unittesting the exception class
-  static bool is_disabled();
-  static void disable();
-  static void enable();
-  static uint32_t disabled_counter();
-  static void increment_disabled_counter();
-
-private:
-  in_port_t _port;
-  char _instance[1024];
-};
-
-class start : public exception
-{
-public:
-  start(const char *file, int line, const char *func, const std::string&, const in_port_t port, const char *format, ...);
-
-  const char* what() const throw()
+  const char* file()
   {
-    return _error_message;
+    return _file;
   }
 
-  // The following are just for unittesting the exception class
-  static bool is_disabled();
-  static void disable();
-  static void enable();
-  static uint32_t disabled_counter();
-  static void increment_disabled_counter();
+  const char* func()
+  {
+    return _func;
+  }
 
 private:
+  char _error_message[BUFSIZ];
   in_port_t _port;
   char _instance[1024];
+  int _line;
+  const char*  _file;
+  const char* _func;
 };