[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[crogers at google.com]

The following commit has been merged in the debian/experimental branch:
commit c32a6b7eeb145401ae6a23cd5020e66703fe3d03
Author: crogers at google.com <crogers at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 02:04:46 2010 +0000

    2010-08-30  Chris Rogers  <crogers at google.com>
    
            Reviewed by Kenneth Russell.
    
            Fix namespace for wtf/Complex.h and wtf/Vector3.h
            https://bugs.webkit.org/show_bug.cgi?id=44892
    
            * wtf/Complex.h:
            * wtf/Vector3.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 181a628..b926001 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-30  Chris Rogers  <crogers at google.com>
+
+        Reviewed by Kenneth Russell.
+
+        Fix namespace for wtf/Complex.h and wtf/Vector3.h
+        https://bugs.webkit.org/show_bug.cgi?id=44892
+
+        * wtf/Complex.h:
+        * wtf/Vector3.h:
+
 2010-08-30  Andy Estes  <aestes at apple.com>
 
         Reviewed by Eric Carlson.
diff --git a/JavaScriptCore/wtf/Complex.h b/JavaScriptCore/wtf/Complex.h
index cfd1d20..7da8511 100644
--- a/JavaScriptCore/wtf/Complex.h
+++ b/JavaScriptCore/wtf/Complex.h
@@ -26,13 +26,13 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef Complex_h
-#define Complex_h
+#ifndef WTF_Complex_h
+#define WTF_Complex_h
 
 #include <complex>
 #include <wtf/MathExtras.h>
 
-namespace WebCore {
+namespace WTF {
 
 typedef std::complex<double> Complex;
 
@@ -41,6 +41,6 @@ inline Complex complexFromMagnitudePhase(double magnitude, double phase)
     return Complex(magnitude * cos(phase), magnitude * sin(phase));
 }
 
-} // namespace WebCore
+} // namespace WTF
 
-#endif // Complex_h
+#endif // WTF_Complex_h
diff --git a/JavaScriptCore/wtf/Vector3.h b/JavaScriptCore/wtf/Vector3.h
index 3c40b61..1850929 100644
--- a/JavaScriptCore/wtf/Vector3.h
+++ b/JavaScriptCore/wtf/Vector3.h
@@ -26,12 +26,12 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef Vector3_h
-#define Vector3_h
+#ifndef WTF_Vector3_h
+#define WTF_Vector3_h
 
 #include <math.h>
 
-namespace WebCore {
+namespace WTF {
 
 class Vector3 {
 public:
@@ -133,6 +133,6 @@ inline double distance(const Vector3& v1, const Vector3& v2)
     return (v1 - v2).abs();
 }
 
-} // WebCore
+} // WTF
 
-#endif // Vector3_h
+#endif // WTF_Vector3_h

-- 
WebKit Debian packaging