[webkit-changes] cvs commit: WebCore/khtml/misc hashtable.h

[Maciej]

mjs         05/06/29 20:19:13

  Modified:    .        ChangeLog
               khtml/misc hashtable.h
  Log:
          Unreviewed - fixing build breakage with gcc 4.
  
          * khtml/misc/hashtable.h: Don't use a typedef when declaring a class friend.
  
  Revision  Changes    Path
  1.4342    +6 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4341
  retrieving revision 1.4342
  diff -u -r1.4341 -r1.4342
  --- ChangeLog	30 Jun 2005 01:56:08 -0000	1.4341
  +++ ChangeLog	30 Jun 2005 03:19:08 -0000	1.4342
  @@ -1,3 +1,9 @@
  +2005-06-29  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Unreviewed - fixing build breakage with gcc 4.
  +
  +        * khtml/misc/hashtable.h: Don't use a typedef when declaring a class friend.
  +
   2005-06-29  David Harrison  <harrison at apple.com>
   
   		Temporarily enable tab coalescing ahead of white-space:pre-wrap
  
  
  
  1.3       +2 -2      WebCore/khtml/misc/hashtable.h
  
  Index: hashtable.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/hashtable.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- hashtable.h	29 Jun 2005 21:04:32 -0000	1.2
  +++ hashtable.h	30 Jun 2005 03:19:13 -0000	1.3
  @@ -67,7 +67,7 @@
       typedef KeyType& ReferenceType;
       typedef KeyType *PointerType;
   
  -    friend class HashTableType;
  +    friend class HashTable<Key, Hash, Equal>;
       
       HashTableIterator(HashTablePointerType table, PointerType position, PointerType endPosition) 
           : m_table(table), m_position(position), m_endPosition(endPosition) 
  @@ -126,7 +126,7 @@
       typedef const KeyType& ReferenceType;
       typedef const KeyType *PointerType;
   
  -    friend class HashTableType;
  +    friend class HashTable<Key, Hash, Equal>;
       
       HashTableConstIterator(HashTablePointerType table, PointerType position, PointerType endPosition) 
           : m_table(table), m_position(position), m_endPosition(endPosition)