Skip to content
Permalink
Browse files

Tue Jan 31 11:33:04 2012 Google Inc. <google-sparsehash@googlegroups.…

…com>

	* sparsehash: version 2.0
	* Renamed include directory from google/ to sparsehash/ (csilvers)
	* Changed the 'official' sparsehash email in setup.py/etc
	* Renamed google-sparsehash.sln to sparsehash.sln
	* Changed copyright text to reflect Google's relinquished ownership
  • Loading branch information...
csilvers
csilvers committed Jan 31, 2012
1 parent 24cf4f8 commit b621b0c53615473a172aeb7fed0164a7d4df25ba
Showing with 7,735 additions and 6,940 deletions.
  1. +1 −1 AUTHORS
  2. +8 −0 ChangeLog
  3. +64 −42 Makefile.am
  4. +261 −175 Makefile.in
  5. +40 −2 NEWS
  6. +1 −1 README
  7. +3 −3 README_windows.txt
  8. +102 −84 aclocal.m4
  9. +102 −77 configure
  10. +2 −1 configure.ac
  11. +1 −1 doc/dense_hash_map.html
  12. +1 −1 doc/dense_hash_set.html
  13. +0 −6 doc/designstyle.css
  14. +4 −5 doc/index.html
  15. +1 −1 doc/performance.html
  16. +1 −1 doc/sparse_hash_map.html
  17. +1 −1 doc/sparse_hash_set.html
  18. +1 −1 doc/sparsetable.html
  19. +1 −1 experimental/example.c
  20. +1 −1 experimental/libchash.c
  21. +1 −1 experimental/libchash.h
  22. +6 −0 packages/deb/changelog
  23. +1 −1 packages/deb/control
  24. +5 −4 packages/deb/copyright
  25. +1 −0 packages/deb/sparsehash.dirs
  26. +2 −0 packages/deb/sparsehash.install
  27. +4 −3 packages/rpm/rpm.spec
  28. +63 −0 sparsehash.sln
  29. +0 −3 src/config.h.in
  30. +5 −340 src/google/dense_hash_map
  31. +5 −309 src/google/dense_hash_set
  32. +5 −334 src/google/sparse_hash_map
  33. +5 −309 src/google/sparse_hash_set
  34. +5 −1,290 src/google/sparsehash/densehashtable.h
  35. +5 −352 src/google/sparsehash/hashtable-common.h
  36. +5 −90 src/google/sparsehash/libc_allocator_with_realloc.h
  37. +5 −1,218 src/google/sparsehash/sparsehashtable.h
  38. +5 −1,791 src/google/sparsetable
  39. +5 −105 src/google/template_util.h
  40. +5 −313 src/google/type_traits.h
  41. +7 −7 src/hash_test_interface.h
  42. +3 −3 src/hashtable_test.cc
  43. +2 −2 src/libc_allocator_with_realloc_test.cc
  44. +108 −0 src/simple_compat_test.cc
  45. +7 −5 src/simple_test.cc
  46. +369 −0 src/sparsehash/dense_hash_map
  47. +338 −0 src/sparsehash/dense_hash_set
  48. +1,319 −0 src/sparsehash/internal/densehashtable.h
  49. +381 −0 src/sparsehash/internal/hashtable-common.h
  50. +119 −0 src/sparsehash/internal/libc_allocator_with_realloc.h
  51. +1,247 −0 src/sparsehash/internal/sparsehashtable.h
  52. +363 −0 src/sparsehash/sparse_hash_map
  53. +338 −0 src/sparsehash/sparse_hash_set
  54. +1,820 −0 src/sparsehash/sparsetable
  55. +134 −0 src/sparsehash/template_util.h
  56. +342 −0 src/sparsehash/type_traits.h
  57. +2 −2 src/sparsetable_unittest.cc
  58. +2 −2 src/template_util_unittest.cc
  59. +1 −1 src/testutil.h
  60. +5 −5 src/time_hash_map.cc
  61. +2 −2 src/type_traits_unittest.cc
  62. +1 −1 src/windows/config.h
  63. +1 −1 src/windows/port.cc
  64. +2 −2 src/windows/port.h
  65. +49 −0 src/windows/sparsehash/internal/sparseconfig.h
  66. +11 −11 vsprojects/hashtable_test/hashtable_test.vcproj
  67. +1 −1 vsprojects/libc_allocator_with_realloc_test/libc_allocator_with_realloc_test.vcproj
  68. +10 −10 vsprojects/simple_test/simple_test.vcproj
  69. +4 −4 vsprojects/sparsetable_unittest/sparsetable_unittest.vcproj
  70. +10 −10 vsprojects/time_hash_map/time_hash_map.vcproj
  71. +3 −3 vsprojects/type_traits_unittest/type_traits_unittest.vcproj
@@ -1,2 +1,2 @@
opensource@google.com
google-sparsehash@googlegroups.com

@@ -1,3 +1,11 @@
Tue Jan 31 11:33:04 2012 Google Inc. <google-sparsehash@googlegroups.com>

* sparsehash: version 2.0
* Renamed include directory from google/ to sparsehash/ (csilvers)
* Changed the 'official' sparsehash email in setup.py/etc
* Renamed google-sparsehash.sln to sparsehash.sln
* Changed copyright text to reflect Google's relinquished ownership

Tue Dec 20 21:04:04 2011 Google Inc. <opensource@google.com>

* sparsehash: version 1.12 release
@@ -3,26 +3,14 @@
# Make sure that when we re-make ./configure, we get the macros we need
ACLOCAL_AMFLAGS = -I m4

# This is so we can #include <google/foo>
# This is so we can #include <sparsehash/foo>
AM_CPPFLAGS = -I$(top_srcdir)/src

# These are good warnings to turn on by default
if GCC
AM_CXXFLAGS = -Wall -W -Wwrite-strings -Woverloaded-virtual -Wshadow
endif

googleincludedir = $(includedir)/google
## The .h files you want to install (that is, .h files that people
## who install this package can include in their own applications.)
googleinclude_HEADERS = \
src/google/dense_hash_map \
src/google/dense_hash_set \
src/google/sparse_hash_map \
src/google/sparse_hash_set \
src/google/sparsetable \
src/google/template_util.h \
src/google/type_traits.h

docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
## This is for HTML and other documentation you want to install.
## Add your documentation files (in doc/) in addition to these boilerplate
@@ -42,7 +30,7 @@ dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README README_windows.txt
## The libraries (.so's) you want to install
lib_LTLIBRARIES =
## The location of the windows project file for each binary we make
WINDOWS_PROJECTS = google-sparsehash.sln
WINDOWS_PROJECTS = sparsehash.sln

## unittests you want to run when people type 'make check'.
## TESTS is for binary unittests, check_SCRIPTS for script-based unittests.
@@ -70,8 +58,8 @@ WINDOWS_PROJECTS += vsprojects/time_hash_map/time_hash_map.vcproj
# | fgrep -vx -e -- > _sparsehash_config
# For correctness, it depends on the fact config.h.include does not have
# any lines starting with #.
src/google/sparsehash/sparseconfig.h: $(top_builddir)/src/config.h \
$(top_srcdir)/src/config.h.include
src/sparsehash/internal/sparseconfig.h: $(top_builddir)/src/config.h \
$(top_srcdir)/src/config.h.include
[ -d $(@D) ] || mkdir -p $(@D)
echo "/*" > $(@D)/_sparsehash_config
echo " * NOTE: This file is for internal use only." >> $(@D)/_sparsehash_config
@@ -90,71 +78,105 @@ src/google/sparsehash/sparseconfig.h: $(top_builddir)/src/config.h \
>> $(@D)/_sparsehash_config
mv -f $(@D)/_sparsehash_config $@
# This is how we tell automake about auto-generated .h files
BUILT_SOURCES = src/google/sparsehash/sparseconfig.h
CLEANFILES = src/google/sparsehash/sparseconfig.h
BUILT_SOURCES = src/sparsehash/internal/sparseconfig.h
CLEANFILES = src/sparsehash/internal/sparseconfig.h

sparsehashincludedir = $(googleincludedir)/sparsehash
sparsehashincludedir = $(includedir)/sparsehash
## The .h files you want to install (that is, .h files that people
## who install this package can include in their own applications.)
sparsehashinclude_HEADERS = \
src/google/sparsehash/densehashtable.h \
src/google/sparsehash/sparsehashtable.h \
src/google/sparsehash/hashtable-common.h \
src/sparsehash/dense_hash_map \
src/sparsehash/dense_hash_set \
src/sparsehash/sparse_hash_map \
src/sparsehash/sparse_hash_set \
src/sparsehash/sparsetable \
src/sparsehash/template_util.h \
src/sparsehash/type_traits.h

internalincludedir = $(sparsehashincludedir)/internal
internalinclude_HEADERS = \
src/sparsehash/internal/densehashtable.h \
src/sparsehash/internal/sparsehashtable.h \
src/sparsehash/internal/hashtable-common.h \
src/sparsehash/internal/libc_allocator_with_realloc.h
nodist_internalinclude_HEADERS = src/sparsehash/internal/sparseconfig.h

# This is for backwards compatibility only.
googleincludedir = $(includedir)/google
googleinclude_HEADERS = \
src/google/dense_hash_map \
src/google/dense_hash_set \
src/google/sparse_hash_map \
src/google/sparse_hash_set \
src/google/sparsetable \
src/google/template_util.h \
src/google/type_traits.h \
src/google/sparsehash/densehashtable.h \
src/google/sparsehash/sparsehashtable.h \
src/google/sparsehash/hashtable-common.h \
src/google/sparsehash/libc_allocator_with_realloc.h
nodist_sparsehashinclude_HEADERS = src/google/sparsehash/sparseconfig.h

TESTS += template_util_unittest
WINDOWS_PROJECTS += vsprojects/template_util_unittest/template_util_unittest.vcproj
# TODO(csilvers): Update windows projects for template_util_unittest.
# WINDOWS_PROJECTS += vsprojects/template_util_unittest/template_util_unittest.vcproj
template_util_unittest_SOURCES = \
src/template_util_unittest.cc \
src/google/template_util.h
nodist_template_util_unittest_SOURCES = $(nodist_sparsehashinclude_HEADERS)
src/sparsehash/template_util.h
nodist_template_util_unittest_SOURCES = $(nodist_internalinclude_HEADERS)

TESTS += type_traits_unittest
WINDOWS_PROJECTS += vsprojects/type_traits_unittest/type_traits_unittest.vcproj
type_traits_unittest_SOURCES = \
src/type_traits_unittest.cc \
$(sparsehashinclude_HEADERS) \
src/google/type_traits.h
nodist_type_traits_unittest_SOURCES = $(nodist_sparsehashinclude_HEADERS)
$(internalinclude_HEADERS) \
src/sparsehash/type_traits.h
nodist_type_traits_unittest_SOURCES = $(nodist_internalinclude_HEADERS)

TESTS += libc_allocator_with_realloc_test
WINDOWS_PROJECTS += vsprojects/libc_allocator_with_realloc_test/libc_allocator_with_realloc_test.vcproj
libc_allocator_with_realloc_test_SOURCES = \
src/libc_allocator_with_realloc_test.cc \
$(sparsehashinclude_HEADERS) \
src/google/sparsehash/libc_allocator_with_realloc.h
$(internalinclude_HEADERS) \
src/sparsehash/internal/libc_allocator_with_realloc.h


TESTS += sparsetable_unittest
WINDOWS_PROJECTS += vsprojects/sparsetable_unittest/sparsetable_unittest.vcproj
sparsetable_unittest_SOURCES = \
src/sparsetable_unittest.cc \
$(sparsehashinclude_HEADERS) \
src/google/sparsetable
nodist_sparsetable_unittest_SOURCES = $(nodist_sparsehashinclude_HEADERS)
$(internalinclude_HEADERS) \
src/sparsehash/sparsetable
nodist_sparsetable_unittest_SOURCES = $(nodist_internalinclude_HEADERS)

TESTS += hashtable_test
WINDOWS_PROJECTS += vsprojects/hashtable_test/hashtable_test.vcproj
hashtable_test_SOURCES = \
src/hashtable_test.cc \
src/hash_test_interface.h \
src/testutil.h \
$(googleinclude_HEADERS) \
$(sparsehashinclude_HEADERS)
nodist_hashtable_test_SOURCES = $(nodist_sparsehashinclude_HEADERS)
$(sparsehashinclude_HEADERS) \
$(internalinclude_HEADERS)
nodist_hashtable_test_SOURCES = $(nodist_internalinclude_HEADERS)

TESTS += simple_test
WINDOWS_PROJECTS += vsprojects/simple_test/simple_test.vcproj
simple_test_SOURCES = \
src/simple_test.cc \
$(sparsehashinclude_HEADERS)
nodist_simple_test_SOURCES = $(nodist_sparsehashinclude_HEADERS)
$(internalinclude_HEADERS)
nodist_simple_test_SOURCES = $(nodist_internalinclude_HEADERS)

TESTS += simple_compat_test
simple_compat_test_SOURCES = \
src/simple_compat_test.cc \
$(internalinclude_HEADERS) \
$(googleinclude_HEADERS)
nodist_simple_compat_test_SOURCES = $(nodist_internalinclude_HEADERS)

time_hash_map_SOURCES = \
src/time_hash_map.cc \
$(sparsehashinclude_HEADERS) \
$(googleinclude_HEADERS)
nodist_time_hash_map_SOURCES = $(nodist_sparsehashinclude_HEADERS)
$(internalinclude_HEADERS) \
$(sparsehashinclude_HEADERS)
nodist_time_hash_map_SOURCES = $(nodist_internalinclude_HEADERS)

# If tcmalloc is installed, use it with time_hash_map; it gives us
# heap-usage statistics for the hash_map routines, which is very nice

0 comments on commit b621b0c

Please sign in to comment.
You can’t perform that action at this time.