c++: references cannot be NULL

[awesomized/libmemcached] / libtest / comparison.hpp

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index d75e97fc93e89dc354eebe289c6015141f1b3044..9a7d81c0413a5abb8c02b9dcad7d8cd7d65ec28f 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);
 
@@ -94,11 +91,11 @@ bool _compare(const char *file, int line, const char *func, const T1_comparable&
 }
 
 template <class T1_comparable, class T2_comparable>
-bool _compare_strcmp(const char *file, int line, const char *func, const T1_comparable& __expected, const T2_comparable& __actual)
+bool _compare_strcmp(const char *file, int line, const char *func, const T1_comparable *__expected, const T2_comparable *__actual)
 {
   if (__expected == NULL)
   {
-    fatal_message("Expected value was NULL, programmer error");
+    FATAL("Expected value was NULL, programmer error");
   }
 
   if (__actual == NULL)