always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bump sparsehash to 2.0.3

Browse Source
This commit is contained in:
Laurent Perron
2015-10-20 11:24:31 +02:00
parent 5b284011c6
commit 93e5838eb4
2 changed files with 0 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
dependencies/archives/sparsehash.patch vendored
View File

@@ -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;

1
makefiles/Makefile.third_party.unix
View File

@@ -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