Avoid g++-3.1 typename warning.

ChangeLog

@@ -1,3 +1,15 @@
+2002-05-05  Bruno Haible  <bruno@clisp.org>
+
+	Avoid g++ 3.1 warnings.
+	* src/base/hash/cl_hash.h (struct cl_heap_hashtable): Use typename
+	where needed.
+	* src/base/hash/cl_hash1.h (struct cl_heap_hashtable_1): typedef
+	htxentry as a shortcut.
+	* src/base/hash/cl_hash2.h (struct cl_heap_hashtable_2): Likewise.
+	* src/base/hash/cl_hashset.h (struct cl_heap_hashtable_set): Likewise.
+	* src/base/hash/cl_hashuniq.h (struct cl_heap_hashtable_uniq):
+	Likewise.
+
 2002-03-15  Bruno Haible  <bruno@clisp.org>
 
 	* cln.tex: Document problem with GNU make 3.77.

src/base/hash/cl_hash.h

@@ -154,12 +154,12 @@ struct _cl_hashtable_iterator
   #endif
 {
 private:
-    cl_heap_hashtable<htentry>::htxentry * _entries;
+    typename cl_heap_hashtable<htentry>::htxentry * _entries;
     long _index;
 public:
     _cl_hashtable_iterator () : _entries (0), _index (-1) {}
 public: /* ugh */
-    _cl_hashtable_iterator (cl_heap_hashtable<htentry>::htxentry * e, long i)
+    _cl_hashtable_iterator (typename cl_heap_hashtable<htentry>::htxentry * e, long i)
         : _entries (e), _index (i)
     {
         do { _index--; }

src/base/hash/cl_hash1.h

@@ -31,6 +31,10 @@ struct cl_htentry1 {
 
 template <class key1_type, class value_type>
 struct cl_heap_hashtable_1 : public cl_heap_hashtable <cl_htentry1 <key1_type,value_type> > {
+protected:
+    // Abbreviation.
+    typedef typename cl_heap_hashtable <cl_htentry1 <key1_type,value_type> >::htxentry htxentry;
+public:
     // Allocation.
     void* operator new (size_t size) { return malloc_hook(size); }
     // Deallocation.

src/base/hash/cl_hash2.h

@@ -29,6 +29,10 @@ struct cl_htentry2 {
 
 template <class key1_type, class key2_type, class value_type>
 struct cl_heap_hashtable_2 : public cl_heap_hashtable <cl_htentry2 <key1_type,key2_type,value_type> > {
+protected:
+    // Abbreviation.
+    typedef typename cl_heap_hashtable <cl_htentry2 <key1_type,key2_type,value_type> >::htxentry htxentry;
+public:
     // Allocation.
     void* operator new (size_t size) { return malloc_hook(size); }
     // Deallocation.

src/base/hash/cl_hashset.h

@@ -22,6 +22,10 @@ struct cl_htsetentry {
 
 template <class key1_type>
 struct cl_heap_hashtable_set : public cl_heap_hashtable <cl_htsetentry <key1_type> > {
+protected:
+    // Abbreviation.
+    typedef typename cl_heap_hashtable <cl_htsetentry <key1_type> >::htxentry htxentry;
+public:
     // Allocation.
     void* operator new (size_t size) { return malloc_hook(size); }
     // Deallocation.

src/base/hash/cl_hashuniq.h

@@ -31,6 +31,10 @@ struct cl_htuniqentry {
 
 template <class key1_type, class value_type>
 struct cl_heap_hashtable_uniq : public cl_heap_hashtable <cl_htuniqentry <key1_type,value_type> > {
+protected:
+    // Abbreviation.
+    typedef typename cl_heap_hashtable <cl_htuniqentry <key1_type,value_type> >::htxentry htxentry;
+public:
     // Allocation.
     void* operator new (size_t size) { return malloc_hook(size); }
     // Deallocation.