Commit cdd6842b authored by andersca's avatar andersca

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:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@17837 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5250e7f7
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>
......
......@@ -540,6 +540,14 @@
RelativePath="..\..\wtf\FastMallocInternal.h"
>
</File>
<File
RelativePath="..\..\wtf\Forward.h"
>
</File>
<File
RelativePath="..\..\wtf\GetPtr.h"
>
</File>
<File
RelativePath="..\..\wtf\HashCountedSet.h"
>
......@@ -568,10 +576,26 @@
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"
>
......@@ -588,6 +612,30 @@
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"
......
......@@ -14,6 +14,11 @@
#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
......
......@@ -30,10 +30,6 @@
#include <stdlib.h>
#include <utility>
// Temporary workaround for Win32.
// We should use NOMINMAX instead.
#undef max
namespace WTF {
using std::min;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment