osrm-backend/scripts/sparsehash/2.0.2/patch.diff
Dane Springmeyer a34a885031 Squashed 'third_party/mason/' content from commit 1b3085e
git-subtree-dir: third_party/mason
git-subtree-split: 1b3085e812b08ef092ba43945e3ab9f802632280
2016-10-28 12:21:21 -07:00

32 lines
1.6 KiB
Diff

diff --git a/src/sparsehash/internal/sparsehashtable.h b/src/sparsehash/internal/sparsehashtable.h
index 7ee1391..f54ea51 100644
--- a/src/sparsehash/internal/sparsehashtable.h
+++ b/src/sparsehash/internal/sparsehashtable.h
@@ -165,7 +165,7 @@ struct sparse_hashtable_iterator {
public:
typedef sparse_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A> iterator;
typedef sparse_hashtable_const_iterator<V,K,HF,ExK,SetK,EqK,A> const_iterator;
- typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,A>::nonempty_iterator
+ typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,value_alloc_type>::nonempty_iterator
st_iterator;
typedef std::forward_iterator_tag iterator_category; // very little defined!
@@ -217,7 +217,7 @@ struct sparse_hashtable_const_iterator {
public:
typedef sparse_hashtable_iterator<V,K,HF,ExK,SetK,EqK,A> iterator;
typedef sparse_hashtable_const_iterator<V,K,HF,ExK,SetK,EqK,A> const_iterator;
- typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,A>::const_nonempty_iterator
+ typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,value_alloc_type>::const_nonempty_iterator
st_iterator;
typedef std::forward_iterator_tag iterator_category; // very little defined!
@@ -271,7 +271,7 @@ struct sparse_hashtable_destructive_iterator {
public:
typedef sparse_hashtable_destructive_iterator<V,K,HF,ExK,SetK,EqK,A> iterator;
- typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,A>::destructive_iterator
+ typedef typename sparsetable<V,DEFAULT_GROUP_SIZE,value_alloc_type>::destructive_iterator
st_iterator;
typedef std::forward_iterator_tag iterator_category; // very little defined!