Attachment 146628 Details for Bug 193218 – fix build with clang

fix build with clang

p.txt (text/plain), 2.54 KB, created by Dmitry Sivachenko on 2014-09-01 12:50:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Sivachenko

Created: 2014-09-01 12:50:54 UTC

Size: 2.54 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 366625)
>+++ Makefile	(working copy)
>@@ -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: files/patch-src-sparsehash-internal-sparsehashtable.h
>===================================================================
>--- files/patch-src-sparsehash-internal-sparsehashtable.h	(revision 0)
>+++ files/patch-src-sparsehash-internal-sparsehashtable.h	(working copy)
>@@ -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!
>
>Property changes on: files/patch-src-sparsehash-internal-sparsehashtable.h
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View

Attachments on bug 193218: 146628