Changeset 11768 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 26, 2005, 2:08:52 PM (19 years ago)

Author:

hyatt

Message:

Fix win32 bustage. ifdef the swap function for std pairs.

Location:

trunk/JavaScriptCore

Files:

• Makefile.vc (modified) (3 diffs)
• kxmlcore/HashTable.h (modified) (2 diffs)

trunk/JavaScriptCore/Makefile.vc

@@ -4 +4 @@
 OBJDIR=obj
 KJSDIR=kjs
+KXMLCOREDIR=kxmlcore
 PCREDIR=pcre
 
-ICUDIR=$(BASEDIR)\..\..\icu
+ICUDIR=$(BASEDIR)\..\icu
 
 #
@@ -22 +23 @@
 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
@@ -57 +60 @@
 AR       = lib.exe
 ARFLAGS  = $(ARFLAGS) /nologo
-
-PCRE_OBJS=\
-    $(OBJDIR)\pcre.obj \
-    $(NULL)
 
 #

trunk/JavaScriptCore/kxmlcore/HashTable.h

@@ -175 +175 @@
     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)
@@ -182 +184 @@
         swap(a.second, b.second);
     }
+#endif
 
     template<typename T, bool useSwap>