From 93e5838eb4bfbe4daffa0febd4aead46c351f293 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Tue, 20 Oct 2015 11:24:31 +0200
Subject: [PATCH] bump sparsehash to 2.0.3

---
 dependencies/archives/sparsehash.patch | 45 --------------------------
 makefiles/Makefile.third_party.unix    |  1 -
 2 files changed, 46 deletions(-)
 delete mode 100644 dependencies/archives/sparsehash.patch

diff --git a/dependencies/archives/sparsehash.patch b/dependencies/archives/sparsehash.patch
deleted file mode 100644
index 8c3e5f597d..0000000000
--- a/dependencies/archives/sparsehash.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: src/hash_test_interface.h
-===================================================================
---- src/hash_test_interface.h	(revision 116)
-+++ src/hash_test_interface.h	(working copy)
-@@ -433,7 +433,7 @@
-   bool supports_num_table_copies() const { return false; }
-   bool supports_serialization() const { return true; }
-
--  void set_empty_key(const typename p::key_type& k) { }
-+  void set_empty_key(const typename p::key_type&) { }
-   void clear_empty_key() { }
-   typename p::key_type empty_key() const { return typename p::key_type(); }
-
-@@ -540,7 +540,7 @@
-   bool supports_num_table_copies() const { return false; }
-   bool supports_serialization() const { return true; }
-
--  void set_empty_key(const typename p::key_type& k) { }
-+  void set_empty_key(const typename p::key_type&) { }
-   void clear_empty_key() { }
-   typename p::key_type empty_key() const { return typename p::key_type(); }
-
-@@ -656,7 +656,7 @@
-   bool supports_num_table_copies() const { return true; }
-   bool supports_serialization() const { return true; }
-
--  void set_empty_key(const typename p::key_type& k) { }
-+  void set_empty_key(const typename p::key_type&) { }
-   void clear_empty_key() { }
-   typename p::key_type empty_key() const { return typename p::key_type(); }
-
-Index: src/sparsehash/sparsetable
-===================================================================
---- src/sparsehash/sparsetable	(revision 116)
-+++ src/sparsehash/sparsetable	(working copy)
-@@ -1442,7 +1442,8 @@
-   }
-
-   typedef sparsegroup<value_type, GROUP_SIZE, allocator_type> group_type;
--  typedef std::vector<group_type, vector_alloc > group_vector_type;
-+  typedef typename Alloc::template rebind<group_type>::other group_vector_type_allocator_type;
-+  typedef std::vector<group_type, group_vector_type_allocator_type> group_vector_type;
-
-   typedef typename group_vector_type::reference GroupsReference;
-   typedef typename group_vector_type::const_reference GroupsConstReference;
diff --git a/makefiles/Makefile.third_party.unix b/makefiles/Makefile.third_party.unix
index 1753928050..0285b53592 100644
--- a/makefiles/Makefile.third_party.unix
+++ b/makefiles/Makefile.third_party.unix
@@ -285,7 +285,6 @@ dependencies/sources/sparsehash-$(SPARSEHASH_TAG)/configure: dependencies/source
 
 dependencies/sources/sparsehash-$(SPARSEHASH_TAG)/autogen.sh:
 	git clone -b sparsehash-$(SPARSEHASH_TAG) https://github.com/sparsehash/sparsehash.git dependencies/sources/sparsehash-$(SPARSEHASH_TAG)
-#	cd dependencies/sources/sparsehash-$(SPARSEHASH_TAG) && patch -p0 -i ../../archives/sparsehash.patch
 
 # Install Coin CBC.
 install_cbc: dependencies/install/bin/cbc