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

[Maciej]

mjs         05/07/06 01:38:08

  Modified:    .        ChangeLog
               khtml/misc hashset.h
  Log:
          Even yet still more gcc4 build fixes.
  
          * khtml/misc/hashset.h:
          (khtml::convertAdapter):
          (khtml::::insert):
  
  Revision  Changes    Path
  1.4377    +8 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4376
  retrieving revision 1.4377
  diff -u -r1.4376 -r1.4377
  --- ChangeLog	6 Jul 2005 07:34:59 -0000	1.4376
  +++ ChangeLog	6 Jul 2005 08:38:04 -0000	1.4377
  @@ -1,5 +1,13 @@
   2005-07-06  Maciej Stachowiak  <mjs at apple.com>
   
  +        Even yet still more gcc4 build fixes.
  +	
  +        * khtml/misc/hashset.h:
  +        (khtml::convertAdapter):
  +        (khtml::::insert):
  +
  +2005-07-06  Maciej Stachowiak  <mjs at apple.com>
  +
           More ggc-4-only build fixage.
   	
           * khtml/misc/hashtraits.h:
  
  
  
  1.4       +7 -11     WebCore/khtml/misc/hashset.h
  
  Index: hashset.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/hashset.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- hashset.h	6 Jul 2005 01:28:42 -0000	1.3
  +++ hashset.h	6 Jul 2005 08:38:08 -0000	1.4
  @@ -35,6 +35,12 @@
       return t; 
   }
   
  +template<typename Value, typename T, Value ConvertT(const T&, unsigned)> 
  +inline Value convertAdapter(const T& t, const T&, unsigned h)
  +{ 
  +    return ConvertT(t, h); 
  +}
  +
   template<typename Value, typename HashFunctions = DefaultHash<Value>, typename Traits = HashTraits<Value> >
   class HashSet {
    private:
  @@ -72,9 +78,6 @@
       void clear();
   
    private:
  -    template<typename T, ValueType ConvertT(const T&, unsigned)> 
  -    static ValueType convertAdapter(const T& t, const T&, unsigned h);
  -
       ImplType m_impl;
   };
   
  @@ -148,7 +151,7 @@
   template<typename T, unsigned HashT(const T&), bool EqualT(const Value&, const T&), Value ConvertT(const T&, unsigned)> 
   std::pair<typename HashSet<Value, HashFunctions, Traits>::iterator, bool> HashSet<Value, HashFunctions, Traits>::insert(const T& value)
   {
  -    return m_impl.insert<T, T, HashT, EqualT, HashSet::convertAdapter<T, ConvertT> >(value, value); 
  +    return m_impl.insert<T, T, HashT, EqualT, convertAdapter<Value, T, ConvertT> >(value, value); 
   }
   
   template<typename Value, typename HashFunctions, typename Traits>
  @@ -169,13 +172,6 @@
       m_impl.clear(); 
   }
   
  -template<typename Value, typename HashFunctions, typename Traits>
  -template<typename T, Value ConvertT(const T&, unsigned)> 
  -inline Value HashSet<Value, HashFunctions, Traits>::convertAdapter(const T& t, const T&, unsigned h)
  -{ 
  -    return ConvertT(t, h); 
  -}
  -
   } // namespace khtml
   
   #endif /* HASHSET_H */