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

[Maciej]

mjs         05/07/09 23:48:20

  Modified:    .        ChangeLog
               khtml/misc hashtraits.h
  Log:
          Reviewed and landed by Maciej.
  
  	Fixed a build error with GCC4 and the use of _M_type.
  
          * khtml/misc/hashtraits.h:
          Test for GCC4 and use the new __value enum from _M_type.
  
  Revision  Changes    Path
  1.4400    +9 -0      WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4399
  retrieving revision 1.4400
  diff -u -r1.4399 -r1.4400
  --- ChangeLog	10 Jul 2005 02:27:18 -0000	1.4399
  +++ ChangeLog	10 Jul 2005 06:48:16 -0000	1.4400
  @@ -1,3 +1,12 @@
  +2005-07-09  Timothy Hatcher  <timothy at colloquy.info>
  +
  +        Reviewed and landed by Maciej.
  +
  +	Fixed a build error with GCC4 and the use of _M_type.
  +
  +        * khtml/misc/hashtraits.h:
  +        Test for GCC4 and use the new __value enum from _M_type.
  +
   2005-07-09  David Hyatt  <hyatt at apple.com>
   
   	Make sure to keep eLastEntry at the end of the list, since it is used for the dynamic portion of the
  
  
  
  1.3       +4 -0      WebCore/khtml/misc/hashtraits.h
  
  Index: hashtraits.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/hashtraits.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- hashtraits.h	6 Jul 2005 07:35:02 -0000	1.2
  +++ hashtraits.h	10 Jul 2005 06:48:20 -0000	1.3
  @@ -33,7 +33,11 @@
   template<typename T>
   struct HashTraits {
       typedef T traitType;
  +#ifdef __GLIBCXX__ // gcc 3.4 and greater:
  +    static const bool emptyValueIsZero = std::__is_integer<T>::__value;
  +#else
       static const bool emptyValueIsZero = std::__is_integer<T>::_M_type;
  +#endif
   
       static traitType emptyValue() {
           return traitType();