2006-11-17 Anders Carlsson <acarlsson@apple.com>
authorandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 18 Nov 2006 03:15:42 +0000 (03:15 +0000)
committerandersca <andersca@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 18 Nov 2006 03:15:42 +0000 (03:15 +0000)
        Reviewed by Adam.

        Make sure that we always use std::min and std::max instead of macros.

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * kjs/config.h:
        * wtf/Vector.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17837 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
JavaScriptCore/kjs/config.h
JavaScriptCore/wtf/Vector.h

index cfed22bc9c1dd857d7a4d963745c4721f5bad211..69a0bf7b03bd3127fb2ec09234ee731baff6380b 100644 (file)
@@ -1,3 +1,13 @@
+2006-11-17  Anders Carlsson  <acarlsson@apple.com>
+
+        Reviewed by Adam.
+
+        Make sure that we always use std::min and std::max instead of macros.
+        
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * kjs/config.h:
+        * wtf/Vector.h:
+
 === Safari-521.31 ===
 
 2006-11-12  Geoffrey Garen  <ggaren@apple.com>
index e12a6a86179d565e29cc8caa1d980b0857147cc4..bdc8c91652d9a6a6e7601881c082b567c5357bc7 100644 (file)
                                RelativePath="..\..\wtf\FastMallocInternal.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\wtf\Forward.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\GetPtr.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\wtf\HashCountedSet.h"
                                >
                                RelativePath="..\..\wtf\HashTraits.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\wtf\ListRefPtr.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\wtf\MathExtras.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\wtf\Noncopyable.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\OwnArrayPtr.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\OwnPtr.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\wtf\PassRefPtr.h"
                                >
                                RelativePath="..\..\wtf\StringExtras.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\wtf\TCPageMap.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\TCSpinLock.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\TCSystemAlloc.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\UnusedParam.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\Vector.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\wtf\VectorTraits.h"
+                               >
+                       </File>
                </Filter>
                <Filter
                        Name="PCRE"
index d23794db8822d13ca3010200e00419395a110041..7031fbe5fdc50a7f24db87fd5fb59a8015527a1a 100644 (file)
 
 #elif PLATFORM(WIN_OS)
 
+// If we don't define these, they get defined in windef.h. 
+// We want to use std::min and std::max
+#define max max
+#define min min
+
 #define HAVE_FLOAT_H 1
 #define HAVE_FUNC__FINITE 1
 #define HAVE_SYS_TIMEB_H 1
index 89f5fd518b252d9769c6775529185107965fb710..496f1c761ed69bded8790580dd0ef1afd953b194 100644 (file)
 #include <stdlib.h>
 #include <utility>
 
-// Temporary workaround for Win32.
-// We should use NOMINMAX instead.
-#undef max
-
 namespace WTF {
 
     using std::min;