motiejus/turbonss
1
Fork 0
Code Releases Activity

Forgot.

Browse Source
This commit is contained in:
Davi Reis 2012-05-28 01:39:36 -03:00
parent 9d59436461
commit cdc0f5cd98
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -21,7 +21,7 @@ fi
if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then if test "x$ac_cv_sys_largefile_LIBS" = "xno" ; then
ac_cv_sys_largefile_LIBS="" ac_cv_sys_largefile_LIBS=""
fi fi
CFLAGS="$$ac_cv_sys_largefile_CFLAGS $CFLAGS" CFLAGS="$ac_cv_sys_largefile_CFLAGS $CFLAGS"
LDFLAGS="$ac_cv_sys_largefile_LDFLAGS $LDFLAGS" LDFLAGS="$ac_cv_sys_largefile_LDFLAGS $LDFLAGS"
LIBS="$LIBS $ac_cv_sys_largefile_LIBS" LIBS="$LIBS $ac_cv_sys_largefile_LIBS"
@ -31,10 +31,10 @@ AC_CHECK_HEADERS([getopt.h math.h])
dnl Checks for libraries. dnl Checks for libraries.
LT_LIB_M LT_LIB_M
LDFLAGS="$LIBM $LDFLAGS" LDFLAGS="$LIBM $LDFLAGS"
CFLAGS="-Wall -Werror" CFLAGS="-Wall"
AC_PROG_CXX 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 AC_ENABLE_CXXMPH
if test x$cxxmph = xtrue; then if test x$cxxmph = xtrue; then
AC_COMPILE_STDCXX_0X AC_COMPILE_STDCXX_0X

4
cxxmph/Makefile.am
View File

@ -1,5 +1,5 @@
TESTS = $(check_PROGRAMS) 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 noinst_PROGRAMS = bm_index bm_map
bin_PROGRAMS = cxxmph bin_PROGRAMS = cxxmph
lib_LTLIBRARIES = libcxxmph.la 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_SOURCES = mph_bits_test.cc
mph_bits_test_LDADD = libcxxmph.la mph_bits_test_LDADD = libcxxmph.la
map_tester_test_SOURCES = map_tester.cc map_tester_test.cc

6
cxxmph/bm_map.cc
View File

@ -75,8 +75,8 @@ class BM_SearchUint64 : public SearchUint64Benchmark {
cerr << "Doing double check" << endl; cerr << "Doing double check" << endl;
for (uint32_t i = 0; i < values_.size(); ++i) { for (uint32_t i = 0; i < values_.size(); ++i) {
if (mymap_[values_[i]] != values_[i]) { if (mymap_[values_[i]] != values_[i]) {
fprintf(stderr, "Looking for %u th key value %llu yielded %llu\n", cerr << "Looking for " << i << " th key value " << values_[i];
i ,values_[i], mymap_[values_[i]]); cerr << " yielded " << mymap_[values_[i]] << endl;
return false; return false;
} }
} }
@ -86,7 +86,7 @@ class BM_SearchUint64 : public SearchUint64Benchmark {
for (auto it = random_.begin(); it != random_.end(); ++it) { for (auto it = random_.begin(); it != random_.end(); ++it) {
auto v = myfind(mymap_, *it); auto v = myfind(mymap_, *it);
if (*v != *it) { if (*v != *it) {
fprintf(stderr, "Looked for %llu got %llu\n", *it, *v); cerr << "Looked for " << *it << " got " << *v << endl;
exit(-1); exit(-1);
} }
} }