From f8d5fe91f12e9c32e55ef4725cafaa26cfdc239e Mon Sep 17 00:00:00 2001
From: Davi de Castro Reis <davi.reis@gmail.com>
Date: Mon, 30 Apr 2012 00:55:28 -0300
Subject: [PATCH 1/2] Fixed warnings.

---
 cxxmph/bm_map.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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);
       }
     }

From 7c425203df4b3e635019fb086c28fb4e4415d32c Mon Sep 17 00:00:00 2001
From: Davi Reis <davi@google.com>
Date: Wed, 9 May 2012 14:04:34 -0300
Subject: [PATCH 2/2] Fixed configure.ac for ubuntu.

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 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