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

[Maciej]

mjs         05/07/06 22:42:27

  Modified:    .        ChangeLog
               khtml/misc hashset.h hashtable.h
  Log:
          Reviewed by hyatt.
  
          - fixed size() and contains() methods on HashSet (they would not compile before)
  
          * khtml/misc/hashset.h:
          (khtml::::size):
          * khtml/misc/hashtable.h:
          (khtml::::contains):
  
  Revision  Changes    Path
  1.4380    +11 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4379
  retrieving revision 1.4380
  diff -u -r1.4379 -r1.4380
  --- ChangeLog	7 Jul 2005 03:07:14 -0000	1.4379
  +++ ChangeLog	7 Jul 2005 05:42:22 -0000	1.4380
  @@ -1,3 +1,14 @@
  +2005-07-06  Maciej Stachowiak  <mjs at apple.com>
  +
  +        Reviewed by hyatt.
  +
  +        - fixed size() and contains() methods on HashSet (they would not compile before)
  +
  +        * khtml/misc/hashset.h:
  +        (khtml::::size):
  +        * khtml/misc/hashtable.h:
  +        (khtml::::contains):
  +
   2005-07-06  Eric Seidel  <eseidel at apple.com>
   
           Reviewed by mjs.
  
  
  
  1.5       +1 -1      WebCore/khtml/misc/hashset.h
  
  Index: hashset.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/hashset.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- hashset.h	6 Jul 2005 08:38:08 -0000	1.4
  +++ hashset.h	7 Jul 2005 05:42:26 -0000	1.5
  @@ -84,7 +84,7 @@
   template<typename Value, typename HashFunctions, typename Traits>
   int HashSet<Value, HashFunctions, Traits>::size() const
   {
  -    return m_impl.count(); 
  +    return m_impl.size(); 
   }
   
   template<typename Value, typename HashFunctions, typename Traits>
  
  
  
  1.6       +1 -1      WebCore/khtml/misc/hashtable.h
  
  Index: hashtable.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/hashtable.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- hashtable.h	6 Jul 2005 03:30:16 -0000	1.5
  +++ hashtable.h	7 Jul 2005 05:42:26 -0000	1.6
  @@ -373,7 +373,7 @@
   template<typename Key, typename Value, Key ExtractKey(const Value &), typename HashFunctions, typename Traits>
   inline bool HashTable<Key, Value, ExtractKey, HashFunctions, Traits>::contains(const KeyType& key) const 
   {
  -    return lookup(key).second;
  +    return const_cast<HashTable *>(this)->lookup(key).second;
   }
   
   template<typename Key, typename Value, Key ExtractKey(const Value &), typename HashFunctions, typename Traits>