summaryrefslogtreecommitdiff
path: root/gcc/hash-table.h
diff options
context:
space:
mode:
authortbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-09 03:07:09 +0000
committertbsaunde <tbsaunde@138bc75d-0d04-0410-961f-82ee72b054a4>2014-07-09 03:07:09 +0000
commit0aa6cf04bc25a9c4102a8b35eb73dc1277f4afe8 (patch)
tree705cd46ee9bca37565811b39db26c8ace8d03b8b /gcc/hash-table.h
parent6698dfce642230013b3ee58123ad1b403baa6780 (diff)
downloadgcc-0aa6cf04bc25a9c4102a8b35eb73dc1277f4afe8.tar.gz
playcate old gcc
gcc/ PR bootstrap/61679 * hash-table.h: use hash_table::value_type instead of Descriptor::value_type in the return types of several methods. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@212384 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/hash-table.h')
-rw-r--r--gcc/hash-table.h25
1 files changed, 15 insertions, 10 deletions
diff --git a/gcc/hash-table.h b/gcc/hash-table.h
index 22af12f996c..9c6a34ad70b 100644
--- a/gcc/hash-table.h
+++ b/gcc/hash-table.h
@@ -663,7 +663,7 @@ hash_table<Descriptor, Allocator, false>::~hash_table ()
HASH is the hash value for the element to be inserted. */
template<typename Descriptor, template<typename Type> class Allocator>
-typename Descriptor::value_type **
+typename hash_table<Descriptor, Allocator, false>::value_type **
hash_table<Descriptor, Allocator, false>
::find_empty_slot_for_expand (hashval_t hash)
{
@@ -803,7 +803,7 @@ hash_table<Descriptor, Allocator, false>::clear_slot (value_type **slot)
be used to insert or delete an element. */
template<typename Descriptor, template<typename Type> class Allocator>
-typename Descriptor::value_type *
+typename hash_table<Descriptor, Allocator, false>::value_type *
hash_table<Descriptor, Allocator, false>
::find_with_hash (const compare_type *comparable, hashval_t hash)
{
@@ -841,7 +841,7 @@ hash_table<Descriptor, Allocator, false>
entry, NULL may be returned if memory allocation fails. */
template<typename Descriptor, template<typename Type> class Allocator>
-typename Descriptor::value_type **
+typename hash_table<Descriptor, Allocator, false>::value_type **
hash_table<Descriptor, Allocator, false>
::find_slot_with_hash (const compare_type *comparable, hashval_t hash,
enum insert_option insert)
@@ -922,7 +922,9 @@ hash_table<Descriptor, Allocator, false>
template<typename Descriptor, template<typename Type> class Allocator>
template<typename Argument,
- int (*Callback) (typename Descriptor::value_type **slot, Argument argument)>
+ int (*Callback) (typename hash_table<Descriptor, Allocator,
+ false>::value_type **slot,
+ Argument argument)>
void
hash_table<Descriptor, Allocator, false>::traverse_noresize (Argument argument)
{
@@ -946,7 +948,8 @@ hash_table<Descriptor, Allocator, false>::traverse_noresize (Argument argument)
template <typename Descriptor,
template <typename Type> class Allocator>
template <typename Argument,
- int (*Callback) (typename Descriptor::value_type **slot,
+ int (*Callback) (typename hash_table<Descriptor, Allocator,
+ false>::value_type **slot,
Argument argument)>
void
hash_table<Descriptor, Allocator, false>::traverse (Argument argument)
@@ -1181,7 +1184,7 @@ hash_table<Descriptor, Allocator, true>::~hash_table ()
HASH is the hash value for the element to be inserted. */
template<typename Descriptor, template<typename Type> class Allocator>
-typename Descriptor::value_type *
+typename hash_table<Descriptor, Allocator, true>::value_type *
hash_table<Descriptor, Allocator, true>
::find_empty_slot_for_expand (hashval_t hash)
{
@@ -1321,7 +1324,7 @@ hash_table<Descriptor, Allocator, true>::clear_slot (value_type *slot)
be used to insert or delete an element. */
template<typename Descriptor, template<typename Type> class Allocator>
-typename Descriptor::value_type &
+typename hash_table<Descriptor, Allocator, true>::value_type &
hash_table<Descriptor, Allocator, true>
::find_with_hash (const compare_type &comparable, hashval_t hash)
{
@@ -1358,7 +1361,7 @@ hash_table<Descriptor, Allocator, true>
entry, NULL may be returned if memory allocation fails. */
template<typename Descriptor, template<typename Type> class Allocator>
-typename Descriptor::value_type *
+typename hash_table<Descriptor, Allocator, true>::value_type *
hash_table<Descriptor, Allocator, true>
::find_slot_with_hash (const compare_type &comparable, hashval_t hash,
enum insert_option insert)
@@ -1440,7 +1443,8 @@ hash_table<Descriptor, Allocator, true>
template<typename Descriptor,
template<typename Type> class Allocator>
template<typename Argument,
- int (*Callback) (typename Descriptor::value_type *slot,
+ int (*Callback) (typename hash_table<Descriptor, Allocator,
+ true>::value_type *slot,
Argument argument)>
void
hash_table<Descriptor, Allocator, true>::traverse_noresize (Argument argument)
@@ -1465,7 +1469,8 @@ hash_table<Descriptor, Allocator, true>::traverse_noresize (Argument argument)
template <typename Descriptor,
template <typename Type> class Allocator>
template <typename Argument,
- int (*Callback) (typename Descriptor::value_type *slot,
+ int (*Callback) (typename hash_table<Descriptor, Allocator,
+ true>::value_type *slot,
Argument argument)>
void
hash_table<Descriptor, Allocator, true>::traverse (Argument argument)