OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

functional_hash.h: Add specializations for __intN types. 

* include/bits/functional_hash.h: Add specializations for __intN
types.

* include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp (__gnu_pbds):
Guard against values that might exceed size_t's precision.

From-SVN: r226117
This commit is contained in:
DJ Delorie 2015-07-23 13:57:34 -04:00 committed by DJ Delorie
parent 5a5062b8db
commit 8161e0c343
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2015-07-23 DJ Delorie <dj@redhat.com>
* include/bits/functional_hash.h: Add specializations for __intN
types.
* include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp (__gnu_pbds):
Guard against values that might exceed size_t's precision.
2015-07-20 Jason Merrill <jason@redhat.com>
* include/bits/c++config: Fix abi_tag in special modes.

17
libstdc++-v3/include/bits/functional_hash.h
View File

@ -121,6 +121,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// Explicit specialization for unsigned long long.
_Cxx_hashtable_define_trivial_hash(unsigned long long)
#ifdef __GLIBCXX_TYPE_INT_N_0
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_0)
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_0 unsigned)
#endif
#ifdef __GLIBCXX_TYPE_INT_N_1
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_1)
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_1 unsigned)
#endif
#ifdef __GLIBCXX_TYPE_INT_N_2
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_2)
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_2 unsigned)
#endif
#ifdef __GLIBCXX_TYPE_INT_N_3
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_3)
_Cxx_hashtable_define_trivial_hash(__GLIBCXX_TYPE_INT_N_3 unsigned)
#endif
#undef _Cxx_hashtable_define_trivial_hash
struct _Hash_impl

15
libstdc++-v3/include/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
View File

@ -270,18 +270,24 @@ namespace __gnu_pbds
/* 21 */ 15126ul,
/* 22 */ 24476ul,
/* 23 */ 39602ul,
/* 24 */ 64079ul,
/* 24 */ 64079ul
#if __SIZE_MAX__ > 0xfffful
,
/* 25 */ 103681ul,
/* 26 */ 167761ul,
/* 27 */ 271442ul,
/* 28 */ 439204ul,
/* 29 */ 710646ul,
/* 29 */ 710646ul
#if __SIZE_MAX__ > 0xffffful
,
/* 30 */ 1149851ul,
/* 31 */ 1860497ul,
/* 32 */ 3010349ul,
/* 33 */ 4870846ul,
/* 34 */ 7881196ul,
/* 35 */ 12752042ul,
/* 35 */ 12752042ul
#if __SIZE_MAX__ > 0xfffffful
,
/* 36 */ 20633239ul,
/* 37 */ 33385282ul,
/* 38 */ 54018521ul,
@ -294,6 +300,9 @@ namespace __gnu_pbds
/* 45 */ 1568397607ul,
/* 46 */ 2537720636ul,
/* 47 */ 4106118243ul
#endif
#endif
#endif
/* Pot's good, let's play */
};