[webkit-changes] cvs commit: JavaScriptCore/kxmlcore HashTable.h

[David]

hyatt       05/12/26 14:08:52

  Modified:    .        Makefile.vc
               kxmlcore HashTable.h
  Log:
  Fix win32 bustage.  ifdef the swap function for std pairs.
  
  Revision  Changes    Path
  1.2       +4 -5      JavaScriptCore/Makefile.vc
  
  Index: Makefile.vc
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/Makefile.vc,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Makefile.vc	11 Sep 2005 05:27:30 -0000	1.1
  +++ Makefile.vc	26 Dec 2005 22:08:52 -0000	1.2
  @@ -3,9 +3,10 @@
   BINDIR=bin
   OBJDIR=obj
   KJSDIR=kjs
  +KXMLCOREDIR=kxmlcore
   PCREDIR=pcre
   
  -ICUDIR=$(BASEDIR)\..\..\icu
  +ICUDIR=$(BASEDIR)\..\icu
   
   #
   # Define compiler flags
  @@ -21,6 +22,8 @@
   CFLAGS = $(CFLAGS) /D "HAVE_CONFIG_H"
   CFLAGS = $(CFLAGS) /D "WIN32" /D "__STD_C"
   CFLAGS = $(CFLAGS) /D "_MBCS" /D "_REENTRANT" /EHsc /W1
  +CFLAGS = $(CFLAGS) /I$(BASEDIR)
  +CFLAGS = $(CFLAGS) /I$(KXMLCOREDIR)
   CFLAGS = $(CFLAGS) /I$(BASEDIR)\os-win32
   CFLAGS = $(CFLAGS) /I$(BASEDIR)\pcre
   CFLAGS = $(CFLAGS) /I$(KJSDIR)
  @@ -57,10 +60,6 @@
   AR       = lib.exe
   ARFLAGS  = $(ARFLAGS) /nologo
   
  -PCRE_OBJS=\
  -    $(OBJDIR)\pcre.obj \
  -    $(NULL)
  -
   #
   # jscore.dll
   #
  
  
  
  1.5       +4 -1      JavaScriptCore/kxmlcore/HashTable.h
  
  Index: HashTable.h
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/kxmlcore/HashTable.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- HashTable.h	25 Dec 2005 08:11:18 -0000	1.4
  +++ HashTable.h	26 Dec 2005 22:08:52 -0000	1.5
  @@ -174,13 +174,16 @@
       
       using std::swap;
   
  -    // swap pairs by component, in case of pair members that specialize swap
  +#ifndef WIN32
  +    // Visual C++ has a swap for pairs defined.
  +	// swap pairs by component, in case of pair members that specialize swap
       template<typename T, typename U>
       inline void swap(pair<T, U>& a, pair<T, U>& b)
       {
           swap(a.first, b.first);
           swap(a.second, b.second);
       }
  +#endif
   
       template<typename T, bool useSwap>
       class Mover;