Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-170

[m6w6/libmemcached] / libtest / fatal.cc

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index 1187292ba9e819e322ecaa8eeaec1059e3653f8c..e96d723c8e7350269513c0c881284c1fce4565f0 100644 (file)
--- a/libtest/fatal.cc
+++ b/libtest/fatal.cc
@@ -34,12 +34,13 @@
  *
  */
 
-#include <config.h>
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 #include <cstdarg>
 
 namespace libtest {
 
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 fatal::fatal(const char *file_arg, int line_arg, const char *func_arg, const char *format, ...) :
   std::runtime_error(func_arg),
   _line(line_arg),
@@ -67,11 +68,13 @@ bool fatal::is_disabled()
 
 void fatal::disable()
 {
+  _counter= 0;
   _disabled= true;
 }
 
 void fatal::enable()
 {
+  _counter= 0;
   _disabled= false;
 }
 
@@ -85,6 +88,7 @@ void fatal::increment_disabled_counter()
   _counter++;
 }
 
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 disconnected::disconnected(const char *file_arg, int line_arg, const char *func_arg,
                            const std::string& instance, const in_port_t port,
                            const char *format, ...) :
@@ -104,4 +108,3 @@ disconnected::disconnected(const char *file_arg, int line_arg, const char *func_
 }
 
 } // namespace libtest
-