Merge branch 'master' into cxxmph

Conflicts:
	INSTALL
	Makefile.am
	cxxmph/Makefile.am
	cxxmph/cmph_hash_map.h
	cxxmph/cmph_hash_map_test.cc
	cxxmph/mphtable.cc
	cxxmph/mphtable.h
This commit is contained in:
Davi de Castro Reis
2011-05-15 17:15:57 -03:00
33 changed files with 1034 additions and 525 deletions

View File

@@ -18,5 +18,6 @@ int main(int argc, char** argv) {
BM_REGISTER(bm_sleep, 1);
BM_REGISTER(bm_increment, 1);
run_benchmarks(argc, argv);
return 0;
}