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

[Maciej]

mjs         05/07/06 00:35:03

  Modified:    .        ChangeLog
               khtml/misc hashtraits.h
  Log:
          More ggc-4-only build fixage.
  
          * khtml/misc/hashtraits.h:
  
  Revision  Changes    Path
  1.4376    +6 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4375
  retrieving revision 1.4376
  diff -u -r1.4375 -r1.4376
  --- ChangeLog	6 Jul 2005 07:11:12 -0000	1.4375
  +++ ChangeLog	6 Jul 2005 07:34:59 -0000	1.4376
  @@ -1,5 +1,11 @@
   2005-07-06  Maciej Stachowiak  <mjs at apple.com>
   
  +        More ggc-4-only build fixage.
  +	
  +        * khtml/misc/hashtraits.h:
  +
  +2005-07-06  Maciej Stachowiak  <mjs at apple.com>
  +
           Fix additional gcc-4-only build breakage.
   
           * khtml/misc/pointerhash.h:
  
  
  
  1.2       +5 -4      WebCore/khtml/misc/hashtraits.h
  
  Index: hashtraits.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/hashtraits.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- hashtraits.h	6 Jul 2005 01:28:43 -0000	1.1
  +++ hashtraits.h	6 Jul 2005 07:35:02 -0000	1.2
  @@ -30,7 +30,7 @@
   
   using std::pair;
   
  -template <typename T>
  +template<typename T>
   struct HashTraits {
       typedef T traitType;
       static const bool emptyValueIsZero = std::__is_integer<T>::_M_type;
  @@ -41,6 +41,7 @@
   };
   
   // may not be appropriate for all uses since it would disallow 0 and -1 as keys
  +template<>
   struct HashTraits<int> {
       typedef int traitType;
       static const bool emptyValueIsZero = true;
  @@ -53,7 +54,7 @@
       }
   };
   
  -template <typename P>
  +template<typename P>
   struct HashTraits<P *> {
       typedef P *traitType;
       static const bool emptyValueIsZero = true;
  @@ -66,7 +67,7 @@
       }
   };
   
  -template <typename FirstTraits, typename SecondTraits>
  +template<typename FirstTraits, typename SecondTraits>
   struct PairHashTraits {
   private:
       typedef typename FirstTraits::traitType FirstType;
  @@ -84,7 +85,7 @@
       }
   };
   
  -template <typename First, typename Second>
  +template<typename First, typename Second>
   struct HashTraits<pair<First, Second> > : public PairHashTraits<HashTraits<First>, HashTraits<Second> > {
   };