HashSet: Fix the build with GCC 7.

This commit is contained in:
Augustin Cavalier
2019-02-14 19:57:42 -05:00
parent fc8e5be1c8
commit 759d502e32
+6 -6
View File
@@ -120,9 +120,9 @@ public:
private: private:
typedef BOpenHashTable<HashSetTableDefinition<Key> > ElementTable; typedef BOpenHashTable<HashSetTableDefinition<Key> > ElementTable;
HashSet<Key>* fSet; HashSet<Key>* fSet;
ElementTable::Iterator fIterator; typename ElementTable::Iterator fIterator;
Element* fElement; Element* fElement;
private: private:
friend class HashSet<Key>; friend class HashSet<Key>;
@@ -156,10 +156,10 @@ protected:
template<typename Key, typename Locker = BLocker> template<typename Key, typename Locker = BLocker>
class SynchronizedHashSet : public Locker { class SynchronizedHashSet : public Locker {
public: public:
typedef HashSet<Key>::Iterator Iterator; typedef typename HashSet<Key>::Iterator Iterator;
SynchronizedHashSet() : Locker("synchronized hash set") {} SynchronizedHashSet() : Locker("synchronized hash set") {}
~SynchronizedHashSet() { Lock(); } ~SynchronizedHashSet() { Locker::Lock(); }
status_t InitCheck() const status_t InitCheck() const
{ {
@@ -324,7 +324,7 @@ HashSet<Key>::Size() const
// GetIterator // GetIterator
template<typename Key> template<typename Key>
HashSet<Key>::Iterator typename HashSet<Key>::Iterator
HashSet<Key>::GetIterator() HashSet<Key>::GetIterator()
{ {
return Iterator(this); return Iterator(this);