[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[darin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 4fe6d1fc2a7dd26a39f517c1f67e943f89f829b0
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 01:01:45 2010 +0000

    2010-02-04  Darin Adler  <darin at apple.com>
    
            Reviewed by David Levin.
    
            Make MathExtras.h compatible with <cmath>
            https://bugs.webkit.org/show_bug.cgi?id=34618
    
            * wtf/MathExtras.h: Include <cmath> instead of <math.h>.
            Use "using" as we do elsewhere in WTF for the four functions from <cmath>
            we want to use without the prefix. Later we could consider making the std
            explicit at call sites instead.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54388 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3a311db..176608c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-04  Darin Adler  <darin at apple.com>
+
+        Reviewed by David Levin.
+
+        Make MathExtras.h compatible with <cmath>
+        https://bugs.webkit.org/show_bug.cgi?id=34618
+
+        * wtf/MathExtras.h: Include <cmath> instead of <math.h>.
+        Use "using" as we do elsewhere in WTF for the four functions from <cmath>
+        we want to use without the prefix. Later we could consider making the std
+        explicit at call sites instead.
+
 2010-02-04  Tamas Szirbucz  <szirbucz at inf.u-szeged.hu>
 
         Reviewed by Gavin Barraclough.
diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h
index a18949e..fb4b90a 100644
--- a/JavaScriptCore/wtf/MathExtras.h
+++ b/JavaScriptCore/wtf/MathExtras.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -26,8 +26,8 @@
 #ifndef WTF_MathExtras_h
 #define WTF_MathExtras_h
 
+#include <cmath>
 #include <float.h>
-#include <math.h>
 #include <stdlib.h>
 
 #if OS(SOLARIS)
@@ -186,4 +186,9 @@ inline float deg2turn(float d) { return d / 360.0f; }
 inline float rad2grad(float r) { return r * 200.0f / piFloat; }
 inline float grad2rad(float g) { return g * piFloat / 200.0f; }
 
+using std::isfinite;
+using std::isinf;
+using std::isnan;
+using std::signbit;
+
 #endif // #ifndef WTF_MathExtras_h

-- 
WebKit Debian packaging