Page MenuHomeFreeBSD
Files F145525729

D718.id1349.diff
No OneTemporary
Actions

D718.id1349.diff
View Options

Index: devel/google-sparsehash/Makefile
===================================================================
--- devel/google-sparsehash/Makefile
+++ devel/google-sparsehash/Makefile
@@ -15,7 +15,7 @@
COMMENT= Extremely memory-efficient hash_map implementation
GNU_CONFIGURE= yes
-USE_GCC= 4.8+
+USES= compiler:c++11-lang
OPTIONS_DEFINE= DOCS
Index: devel/google-sparsehash/files/patch-src-sparsehash-internal-sparsehashtable.h
===================================================================
--- /dev/null
+++ devel/google-sparsehash/files/patch-src-sparsehash-internal-sparsehashtable.h
@@ -0,0 +1,29 @@
+--- src/sparsehash/internal/sparsehashtable.h.orig 2012-02-23 00:49:42.000000000 +0400
++++ src/sparsehash/internal/sparsehashtable.h 2014-09-01 16:43:55.000000000 +0400
+@@ -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_iter
+
+ 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!
@@ -0,0 +1,29 @@
+--- src/sparsehash/internal/sparsehashtable.h.orig 2012-02-23 00:49:42.000000000 +0400
++++ src/sparsehash/internal/sparsehashtable.h 2014-09-01 16:43:55.000000000 +0400
+@@ -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_iter
+
+ 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!

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 22, 12:19 AM (18 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28929590
Default Alt Text
D718.id1349.diff (3 KB)

Event Timeline