Remove exposed C++ namespace.

[awesomized/libmemcached] / libtest / fatal.cc

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index 626ec6f8753eee7be140fa3d136ed3a022c37aa1..0ed06c2cd9496e8a4ebeb7102f2b77d3c1208050 100644 (file)
--- a/libtest/fatal.cc
+++ b/libtest/fatal.cc
@@ -41,44 +41,47 @@
 namespace libtest {
 
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
 fatal::fatal(const char *file_arg, int line_arg, const char *func_arg, ...) :
   __test_result(file_arg, line_arg, func_arg)
-  {
-    va_list args;
-    va_start(args, func_arg);
-    const char *format= va_arg(args, const char *);
-    int last_error_length= vsnprintf(0, 0, format, args);
-    _error_message.resize(last_error_length +1);
-    last_error_length= vsnprintf(&_error_message[0], _error_message.size(), format, args);
-    va_end(args);
-  }
+{
+  va_list args;
+  va_start(args, func_arg);
+  init(args);
+  va_end(args);
+}
+
+fatal::fatal( const fatal& other ) :
+  __test_result(other)
+{
+}
 
 static bool _disabled= false;
 static uint32_t _counter= 0;
 
-bool fatal::is_disabled()
+bool fatal::is_disabled() throw()
 {
   return _disabled;
 }
 
-void fatal::disable()
+void fatal::disable() throw()
 {
   _counter= 0;
   _disabled= true;
 }
 
-void fatal::enable()
+void fatal::enable() throw()
 {
   _counter= 0;
   _disabled= false;
 }
 
-uint32_t fatal::disabled_counter()
+uint32_t fatal::disabled_counter() throw()
 {
   return _counter;
 }
 
-void fatal::increment_disabled_counter()
+void fatal::increment_disabled_counter() throw()
 {
   _counter++;
 }
@@ -102,4 +105,15 @@ disconnected::disconnected(const char *file_arg, int line_arg, const char *func_
   snprintf(_error_message, sizeof(_error_message), "%s:%u %s", instance.c_str(), uint32_t(port), last_error);
 }
 
+disconnected::disconnected(const disconnected& other):
+  std::runtime_error(other._func),
+  _port(other._port),
+  _line(other._line),
+  _file(other._file),
+  _func(other._func)
+{
+  strncpy(_error_message, other._error_message, BUFSIZ);
+  strncpy(_instance, other._instance, BUFSIZ);
+}
+
 } // namespace libtest