X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ffatal.hpp;h=c679f9b0844d87961d23728619621ef3bce4d857;hb=7b7d9b168eab9d1753d6b72de17f98975df97986;hp=bc288afeb767cf72498ee86348364dc830c5039f;hpb=a1f2b0b98e03369ed051b232f1fc33ed1d611b16;p=awesomized%2Flibmemcached

diff --git a/libtest/fatal.hpp b/libtest/fatal.hpp
index bc288afe..c679f9b0 100644
--- a/libtest/fatal.hpp
+++ b/libtest/fatal.hpp
@@ -38,24 +38,20 @@
 
 #include <stdexcept>
 
-#ifndef __PRETTY_FUNCTION__
-#define __PRETTY_FUNCTION__ __func__
-#endif
-
-#define LIBYATL_DEFAULT_PARAM __FILE__, __LINE__, __PRETTY_FUNCTION__
-
 namespace libtest {
 
-class fatal : std::runtime_error
+class disconnected : public 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* what() const throw()
   {
     return _error_message;
   }
 
+  disconnected(const disconnected&);
+
   // The following are just for unittesting the exception class
   static bool is_disabled();
   static void disable();
@@ -63,35 +59,28 @@ public:
   static uint32_t disabled_counter();
   static void increment_disabled_counter();
 
-private:
-  char _error_message[BUFSIZ];
-};
-
-class disconnected : std::runtime_error
-{
-public:
-  disconnected(const char *file, int line, const char *func, const char *instance, const in_port_t port, const char *format, ...);
+  int line() const
+  {
+    return _line;
+  }
 
-  const char* what() const throw()
+  const char* file() const
   {
-    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() const
+  {
+    return _func;
+  }
 
 private:
   char _error_message[BUFSIZ];
   in_port_t _port;
-  char _instance[1024];
+  char _instance[BUFSIZ];
+  int _line;
+  const char*  _file;
+  const char* _func;
 };
 
-
 } // namespace libtest
-
-#define fatal_message(__mesg) throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "%s", __mesg)
-#define fatal_assert(__assert) if((__assert)) {} else { throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "%s", #__assert); }