c++: references cannot be NULL

[awesomized/libmemcached] / libtest / comparison.hpp

diff --git a/libtest/comparison.hpp b/libtest/comparison.hpp
index 30119d1e3b1233a9b830512924dadc100f35386f..9a7d81c0413a5abb8c02b9dcad7d8cd7d65ec28f 100644 (file)
--- a/libtest/comparison.hpp
+++ b/libtest/comparison.hpp
@@ -57,10 +57,10 @@ LIBTEST_API
 bool gdb_is_caller(void);
 
 LIBTEST_API
-bool valgrind_is_caller(void);
+bool _in_valgrind(const char *file, int line, const char *func);
 
 LIBTEST_API
-bool _in_valgrind(const char *file, int line, const char *func);
+bool helgrind_is_caller(void);
 
 template <class T_comparable>
 bool _compare_truth(const char *file, int line, const char *func, T_comparable __expected, const char *assertation_label)
@@ -91,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)