Updating ChangeLog and autoconf/automake settings

ChangeLog

@@ -1,3 +1,19 @@
+2013-05-05	Timo Bingmann
+	* btree.h: changing find_lower() to not use binary search for
+	small node sizes. More about this on my blog.
+	* btree.h: implementing bulk_load() to construct a B+ tree from a
+	pre-sorted iterator range.
+	* btree.h: replacing copy loops with std::copy calls.
+	* btree.h: added template parameter UsedAsSet to skip copying of
+	one byte value_type arrays in set container specializations.
+	* license: changing template header source code license to Boost
+	License, and the rest to GPLv3.
+	* memprofile: using malloc_count to create a memory profile of map
+	containers.
+	* speedtest: many changes to also include tr1::unordered_set and
+	to run both map and set container tests.
+	* testsuite: removing cppunit and using enclosed tpunit++ instead.
+
 2011-05-17	Timo Bingmann
 	* speedtest: added results of new speed test run in 2011 and also
 	appended notes to old speed test doxygen page.

Makefile.am

@@ -6,8 +6,8 @@ AM_CFLAGS = -W -Wall -I$(srcdir)/include
 AM_CXXFLAGS = -W -Wall -Wold-style-cast -DBTREE_DEBUG -I$(srcdir)/include
 
 EXTRA_DIST = Doxyfile \
-	doxygen-html/*.* \
-	doxygen-html/search/*.*
+	COPYING.GPLv3 \
+	doxygen-html/*
 
 if GCOV
 

Makefile.in

@@ -54,8 +54,8 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS scripts/config.guess scripts/config.sub \
+	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS \
+	ChangeLog INSTALL scripts/config.guess scripts/config.sub \
 	scripts/depcomp scripts/install-sh scripts/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
@@ -245,8 +245,8 @@ SUBDIRS = . include testsuite speedtest memprofile wxbtreedemo
 AM_CFLAGS = -W -Wall -I$(srcdir)/include
 AM_CXXFLAGS = -W -Wall -Wold-style-cast -DBTREE_DEBUG -I$(srcdir)/include
 EXTRA_DIST = Doxyfile \
-	doxygen-html/*.* \
-	doxygen-html/search/*.*
+	COPYING.GPLv3 \
+	doxygen-html/*
 
 all: all-recursive
 
@@ -257,15 +257,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu Makefile
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for stx-btree 0.8.6.
+# Generated by GNU Autoconf 2.69 for stx-btree 0.9.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='stx-btree'
 PACKAGE_TARNAME='stx-btree'
-PACKAGE_VERSION='0.8.6'
-PACKAGE_STRING='stx-btree 0.8.6'
+PACKAGE_VERSION='0.9'
+PACKAGE_STRING='stx-btree 0.9'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1308,7 +1308,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures stx-btree 0.8.6 to adapt to many kinds of systems.
+\`configure' configures stx-btree 0.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1378,7 +1378,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of stx-btree 0.8.6:";;
+     short | recursive ) echo "Configuration of stx-btree 0.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1481,7 +1481,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-stx-btree configure 0.8.6
+stx-btree configure 0.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1738,7 +1738,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by stx-btree $as_me 0.8.6, which was
+It was created by stx-btree $as_me 0.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2626,7 +2626,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='stx-btree'
- VERSION='0.8.6'
+ VERSION='0.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5818,7 +5818,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by stx-btree $as_me 0.8.6, which was
+This file was extended by stx-btree $as_me 0.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5875,7 +5875,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-stx-btree config.status 0.8.6
+stx-btree config.status 0.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -2,12 +2,12 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(stx-btree, 0.8.6)
+AC_INIT(stx-btree, 0.9)
 AC_CONFIG_SRCDIR([include/stx/btree.h])
 AC_CONFIG_AUX_DIR(scripts)
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE(foreign)
 AM_MAINTAINER_MODE
 
 # set debug info flag if no optimization flags are set.

include/Makefile.am

@@ -12,3 +12,5 @@ nobase_include_HEADERS = \
 	stx/btree_multiset \
 	stx/btree_multimap \
 	stx/btree.dox
+
+EXTRA_DIST = LICENSE_1_0.txt

include/Makefile.in

@@ -228,6 +228,7 @@ nobase_include_HEADERS = \
 	stx/btree_multimap \
 	stx/btree.dox
 
+EXTRA_DIST = LICENSE_1_0.txt
 all: all-am
 
 .SUFFIXES:
@@ -240,9 +241,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu include/Makefile
+	  $(AUTOMAKE) --foreign include/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

include/stx/btree.dox

@@ -188,6 +188,11 @@ void erase(iterator first, iterator last);
 Beyond the usual STL interface the B+ tree classes support some extra goodies.
 
 \code
+// Bulk load a sorted range. Loads items into leaves and constructs a
+// B-tree above them. The tree must be empty when calling this function.
+template <typename Iterator>
+void bulk_load(Iterator ibegin, Iterator iend);
+
 // Output the tree in a pseudo-hierarchical text dump to std::cout. This
 // function requires that BTREE_DEBUG is defined prior to including the btree
 // headers. Furthermore the key and data types must be std::ostream printable.

memprofile/Makefile.am

@@ -6,7 +6,11 @@ noinst_PROGRAMS = memprofile
 
 endif
 
-memprofile_SOURCES = main.cc malloc_count.c
+memprofile_SOURCES = main.cc malloc_count.c malloc_count.h memprofile.h
 
 AM_CXXFLAGS = -W -Wall -Wold-style-cast -I$(top_srcdir)/include
 LIBS = -ldl
+
+EXTRA_DIST = \
+	memprofile.gnuplot \
+	results-2013/*

memprofile/Makefile.in

@@ -55,7 +55,7 @@ build_triplet = @build@
 host_triplet = @host@
 @BUILD_SPEEDTEST_TRUE@noinst_PROGRAMS = memprofile$(EXEEXT)
 subdir = memprofile
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -203,8 +203,12 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-memprofile_SOURCES = main.cc malloc_count.c
+memprofile_SOURCES = main.cc malloc_count.c malloc_count.h memprofile.h
 AM_CXXFLAGS = -W -Wall -Wold-style-cast -I$(top_srcdir)/include
+EXTRA_DIST = \
+	memprofile.gnuplot \
+	results-2013/*
+
 all: all-am
 
 .SUFFIXES:
@@ -218,9 +222,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu memprofile/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign memprofile/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu memprofile/Makefile
+	  $(AUTOMAKE) --foreign memprofile/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

speedtest/Makefile.am

@@ -15,14 +15,10 @@ AM_CXXFLAGS = -W -Wall -Wold-style-cast -DNDEBUG -I$(top_srcdir)/include
 EXTRA_DIST = \
 	speedtest.gnuplot \
 	transpose.awk \
-	results-2007/speedtest.pdf \
-	results-2007/speedtest-2007-??.png \
-	results-2007/speed-*.txt \
-	results-2007/speed-*.trt \
-	results-2011/speedtest.pdf \
-	results-2011/speedtest-2011-??.png \
-	results-2011/speed-*.txt \
-	results-2011/speed-*.trt
+	results-2007/* \
+	results-2011/* \
+	results-2013/* \
+	results-2013-delta/*
 
 plots:
 	USER=tb ./speedtest.gnuplot

speedtest/Makefile.in

@@ -56,7 +56,7 @@ host_triplet = @host@
 @BUILD_SPEEDTEST_TRUE@noinst_PROGRAMS = speedtest$(EXEEXT) \
 @BUILD_SPEEDTEST_TRUE@	speedtest-tune$(EXEEXT)
 subdir = speedtest
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -209,14 +209,10 @@ AM_CXXFLAGS = -W -Wall -Wold-style-cast -DNDEBUG -I$(top_srcdir)/include
 EXTRA_DIST = \
 	speedtest.gnuplot \
 	transpose.awk \
-	results-2007/speedtest.pdf \
-	results-2007/speedtest-2007-??.png \
-	results-2007/speed-*.txt \
-	results-2007/speed-*.trt \
-	results-2011/speedtest.pdf \
-	results-2011/speedtest-2011-??.png \
-	results-2011/speed-*.txt \
-	results-2011/speed-*.trt
+	results-2007/* \
+	results-2011/* \
+	results-2013/* \
+	results-2013-delta/*
 
 all: all-am
 
@@ -231,9 +227,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu speedtest/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign speedtest/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu speedtest/Makefile
+	  $(AUTOMAKE) --foreign speedtest/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

testsuite/Makefile.in

@@ -56,7 +56,7 @@ host_triplet = @host@
 noinst_PROGRAMS = testsuite$(EXEEXT)
 TESTS = testsuite$(EXEEXT)
 subdir = testsuite
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -228,9 +228,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu testsuite/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign testsuite/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu testsuite/Makefile
+	  $(AUTOMAKE) --foreign testsuite/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \

wxbtreedemo/Makefile.in

@@ -57,7 +57,7 @@ host_triplet = @host@
 @GOT_RESCOMP_TRUE@@HAVE_WXWIDGETS_TRUE@am__append_1 = resources.o
 subdir = wxbtreedemo
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	AUTHORS COPYING
+	AUTHORS
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -234,9 +234,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu wxbtreedemo/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign wxbtreedemo/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu wxbtreedemo/Makefile
+	  $(AUTOMAKE) --foreign wxbtreedemo/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \