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

[alice.liu at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0ded9d4df9fbfc4ad1e6456e24e222561494390e
Author: alice.liu at apple.com <alice.liu at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 14 23:37:58 2010 +0000

    Fix clang++ build.
    
    * UIProcess/WebProcessProxy.h:
    (WebKit::WebProcessProxy::sendSync):
    Move the default argument to the declaration.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74064 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 84db60a..47cccb1 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-14  Alice Liu  <alice.liu at apple.com>
+
+        Fix clang++ build.
+
+        * UIProcess/WebProcessProxy.h:
+        (WebKit::WebProcessProxy::sendSync):
+        Move the default argument to the declaration.
+
 2010-12-14  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/UIProcess/WebProcessProxy.h b/WebKit2/UIProcess/WebProcessProxy.h
index f2a031d..df4acce 100644
--- a/WebKit2/UIProcess/WebProcessProxy.h
+++ b/WebKit2/UIProcess/WebProcessProxy.h
@@ -64,7 +64,7 @@ public:
 
     template<typename E, typename T> bool send(E messageID, uint64_t destinationID, const T& arguments);
     template<typename T> bool send(const T& message, uint64_t destinationID);
-    template<typename U> bool sendSync(const U& message, const typename U::Reply& reply, uint64_t destinationID, double timeout);
+    template<typename U> bool sendSync(const U& message, const typename U::Reply& reply, uint64_t destinationID, double timeout = 1);
     
     CoreIPC::Connection* connection() const
     { 
@@ -168,7 +168,7 @@ bool WebProcessProxy::send(const T& message, uint64_t destinationID)
 }
 
 template<typename U> 
-bool WebProcessProxy::sendSync(const U& message, const typename U::Reply& reply, uint64_t destinationID, double timeout = 1)
+bool WebProcessProxy::sendSync(const U& message, const typename U::Reply& reply, uint64_t destinationID, double timeout)
 {
     return m_connection->sendSync(message, reply, destinationID, timeout);
 }

-- 
WebKit Debian packaging