From cdc0f5cd98cf056a035dab060be268715adcbd19 Mon Sep 17 00:00:00 2001
From: Davi Reis <davi.reis>
Date: Mon, 28 May 2012 01:39:36 -0300
Subject: [PATCH] Forgot.

---
 configure.ac       | 6 +++---
 cxxmph/Makefile.am | 4 +++-
 cxxmph/bm_map.cc   | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index fcb829b..4fe517b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ fi
 if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then
 	ac_cv_sys_largefile_LIBS=""
 fi
-CFLAGS="$$ac_cv_sys_largefile_CFLAGS $CFLAGS"
+CFLAGS="$ac_cv_sys_largefile_CFLAGS $CFLAGS"
 LDFLAGS="$ac_cv_sys_largefile_LDFLAGS $LDFLAGS"
 LIBS="$LIBS $ac_cv_sys_largefile_LIBS"
 
@@ -31,10 +31,10 @@ AC_CHECK_HEADERS([getopt.h math.h])
 dnl Checks for libraries.
 LT_LIB_M  
 LDFLAGS="$LIBM $LDFLAGS"
-CFLAGS="-Wall -Werror"
+CFLAGS="-Wall"
 
 AC_PROG_CXX
-CXXFLAGS="-Wall -Winline -Wno-unused-function -Werror -DNDEBUG -O3 -fomit-frame-pointer $CXXFLAGS"
+CXXFLAGS="-Wall -Wno-unused-function -DNDEBUG -O3 -fomit-frame-pointer $CXXFLAGS"
 AC_ENABLE_CXXMPH
 if test x$cxxmph = xtrue; then
   AC_COMPILE_STDCXX_0X
diff --git a/cxxmph/Makefile.am b/cxxmph/Makefile.am
index 9a2e08b..04ba47e 100644
--- a/cxxmph/Makefile.am
+++ b/cxxmph/Makefile.am
@@ -1,5 +1,5 @@
 TESTS = $(check_PROGRAMS)
-check_PROGRAMS = seeded_hash_test mph_bits_test hollow_iterator_test mph_map_test mph_index_test trigraph_test
+check_PROGRAMS = seeded_hash_test mph_bits_test hollow_iterator_test mph_map_test mph_index_test trigraph_test map_tester_test
 noinst_PROGRAMS = bm_index bm_map
 bin_PROGRAMS = cxxmph
 lib_LTLIBRARIES = libcxxmph.la
@@ -34,3 +34,5 @@ seeded_hash_test_LDADD   = libcxxmph.la
 mph_bits_test_SOURCES = mph_bits_test.cc
 mph_bits_test_LDADD   = libcxxmph.la
 
+map_tester_test_SOURCES = map_tester.cc map_tester_test.cc
+
diff --git a/cxxmph/bm_map.cc b/cxxmph/bm_map.cc
index 153f354..115f7f8 100644
--- a/cxxmph/bm_map.cc
+++ b/cxxmph/bm_map.cc
@@ -75,8 +75,8 @@ class BM_SearchUint64 : public SearchUint64Benchmark {
     cerr << "Doing double check" << endl;
     for (uint32_t i = 0; i < values_.size(); ++i) {
       if (mymap_[values_[i]] != values_[i]) {
-        fprintf(stderr, "Looking for %u th key value %llu yielded %llu\n",
-                i ,values_[i], mymap_[values_[i]]);
+	cerr << "Looking for " << i << " th key value " << values_[i];
+	cerr << " yielded " << mymap_[values_[i]] << endl;
         return false;
       }
     }
@@ -86,7 +86,7 @@ class BM_SearchUint64 : public SearchUint64Benchmark {
     for (auto it = random_.begin(); it != random_.end(); ++it) {
       auto v = myfind(mymap_, *it);
       if (*v != *it) {
-        fprintf(stderr, "Looked for %llu got %llu\n", *it, *v);
+	cerr << "Looked for " << *it << " got " << *v << endl;
 	exit(-1);
       }
     }