Correct style, use of newer YATL.

[awesomized/libmemcached] / libtest / comparison.hpp

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index d75e97fc93e89dc354eebe289c6015141f1b3044..c67bc33f1a04b2ebad0fb5a7f91de402b4340036 100644 (file)
--- a/libtest/comparison.hpp
+++ b/libtest/comparison.hpp
@@ -39,13 +39,13 @@
 #include <typeinfo>
 
 #if defined(HAVE_LIBMEMCACHED) && HAVE_LIBMEMCACHED
-# include <libmemcached-1.0/memcached.h>
-# include <libmemcachedutil-1.0/ostream.hpp>
-# include <libtest/memcached.hpp>
+#include <libmemcached-1.0/memcached.h>
+#include <libmemcachedutil-1.0/ostream.hpp>
+#include <libtest/memcached.hpp>
 #endif
 
 #if defined(HAVE_LIBGEARMAN) && HAVE_LIBGEARMAN
-# include <libgearman-1.0/ostream.hpp>
+#include <libgearman-1.0/ostream.hpp>
 #endif
 
 namespace libtest {
@@ -56,9 +56,6 @@ bool jenkins_is_caller(void);
 LIBTEST_API
 bool gdb_is_caller(void);
 
-LIBTEST_API
-bool valgrind_is_caller(void);
-
 LIBTEST_API
 bool _in_valgrind(const char *file, int line, const char *func);
 
@@ -98,7 +95,7 @@ bool _compare_strcmp(const char *file, int line, const char *func, const T1_comp
 {
   if (__expected == NULL)
   {
-    fatal_message("Expected value was NULL, programmer error");
+    FATAL("Expected value was NULL, programmer error");
   }
 
   if (__actual == NULL)