hrev52869 adds 1 changeset to branch 'master'
old head: fc8e5be1c8091c5461fa631688b3846765a7b1bb
new head: 759d502e32e2571cb38a60fe6cb928fa686b92bf
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=759d502e32e2+%5Efc8e5be1c809
----------------------------------------------------------------------------
759d502e32e2: HashSet: Fix the build with GCC 7.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52869
Commit: 759d502e32e2571cb38a60fe6cb928fa686b92bf
URL: https://git.haiku-os.org/haiku/commit/?id=759d502e32e2
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Fri Feb 15 00:57:42 2019 UTC
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 6 deletions(-)
headers/private/shared/HashSet.h | 12 ++++++------
----------------------------------------------------------------------------
diff --git a/headers/private/shared/HashSet.h b/headers/private/shared/HashSet.h
index 195d994d13..e8d75de984 100644
--- a/headers/private/shared/HashSet.h
+++ b/headers/private/shared/HashSet.h
@@ -120,9 +120,9 @@ public:
private:
typedef BOpenHashTable<HashSetTableDefinition<Key> >
ElementTable;
- HashSet<Key>* fSet;
- ElementTable::Iterator fIterator;
- Element* fElement;
+ HashSet<Key>* fSet;
+ typename ElementTable::Iterator fIterator;
+ Element*
fElement;
private:
friend class HashSet<Key>;
@@ -156,10 +156,10 @@ protected:
template<typename Key, typename Locker = BLocker>
class SynchronizedHashSet : public Locker {
public:
- typedef HashSet<Key>::Iterator Iterator;
+ typedef typename HashSet<Key>::Iterator Iterator;
SynchronizedHashSet() : Locker("synchronized hash set") {}
- ~SynchronizedHashSet() { Lock(); }
+ ~SynchronizedHashSet() { Locker::Lock(); }
status_t InitCheck() const
{
@@ -324,7 +324,7 @@ HashSet<Key>::Size() const
// GetIterator
template<typename Key>
-HashSet<Key>::Iterator
+typename HashSet<Key>::Iterator
HashSet<Key>::GetIterator()
{
return Iterator(this);
