Attachment 227423 Details for Bug 130585 – Patch

[patch] Patch

bug-130585-20140321151025.patch (text/plain), 2.30 KB, created by Andres Gomez Garcia on 2014-03-21 06:10:48 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andres Gomez Garcia

Created: 2014-03-21 06:10:48 PDT

Size: 2.30 KB

patch

obsolete

>Subversion Revision: 166045
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index 0bdce7a714d7635ef213af011dede1fd38ec9881..449bc8937c50d055eefb098405b38f93a9e64db2 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,20 @@
>+2014-03-21  Andres Gomez  <agomez@igalia.com>
>+
>+        [GTK] [EFL] Build fails with GCC < 4.8.x
>+        https://bugs.webkit.org/show_bug.cgi?id=130585
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The behavior in lower versions of GCC seem to be related to
>+        http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-active.html#2132.
>+
>+        Provided explicit casts for the failing ambiguous overloads.
>+
>+        * wtf/gtk/MainThreadGtk.cpp:
>+        (WTF::scheduleDispatchFunctionsOnMainThread):
>+        * wtf/gtk/RunLoopGtk.cpp:
>+        (WTF::RunLoop::wakeUp):
>+
> 2014-03-20  Darin Adler  <darin@apple.com>
> 
>         Fix a header guard mistake (harmless but clearly wrong)
>diff --git a/Source/WTF/wtf/gtk/MainThreadGtk.cpp b/Source/WTF/wtf/gtk/MainThreadGtk.cpp
>index 0134f591ce26c6212b0dc267778a3910c205df50..2fe708f7cfac4ae2fc78a777beebb525d3fa029d 100644
>--- a/Source/WTF/wtf/gtk/MainThreadGtk.cpp
>+++ b/Source/WTF/wtf/gtk/MainThreadGtk.cpp
>@@ -40,7 +40,7 @@ void initializeMainThreadPlatform()
> 
> void scheduleDispatchFunctionsOnMainThread()
> {
>-    GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] dispatchFunctionsFromMainThread", dispatchFunctionsFromMainThread);
>+    GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] dispatchFunctionsFromMainThread", (std::function<void()>) dispatchFunctionsFromMainThread);
> }
> 
> } // namespace WTF
>diff --git a/Source/WTF/wtf/gtk/RunLoopGtk.cpp b/Source/WTF/wtf/gtk/RunLoopGtk.cpp
>index bfa668eb666b9e569e53f9857c38857cb840712e..d49115701af5078b7a60e1fd5dfbe2a7074e9cea 100644
>--- a/Source/WTF/wtf/gtk/RunLoopGtk.cpp
>+++ b/Source/WTF/wtf/gtk/RunLoopGtk.cpp
>@@ -100,7 +100,7 @@ void RunLoop::stop()
> void RunLoop::wakeUp()
> {
>     ref();
>-    GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] RunLoop work", std::bind(&RunLoop::performWork, this),
>+    GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] RunLoop work", (std::function<void()>) std::bind(&RunLoop::performWork, this),
>         G_PRIORITY_DEFAULT, [this] { deref(); });
>     g_main_context_wakeup(m_runLoopContext.get());
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 130585: 227423 | 227425 | 227428 | 227429 | 228738 | 228739