Attachment #227423 for bug #130585

View Details Raw Unified Return to Bug 130585

| Differences between



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)

Lines 40-46 void initializeMainThreadPlatform() a/Source/WTF/wtf/gtk/MainThreadGtk.cpp_sec1
- a/Source/WTF/wtf/gtk/MainThreadGtk.cpp -1 / +1 lines
40		40
41	void scheduleDispatchFunctionsOnMainThread()	41	void scheduleDispatchFunctionsOnMainThread()
42	{	42	{
43	GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] dispatchFunctionsFromMainThread", dispatchFunctionsFromMainThread);	43	GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] dispatchFunctionsFromMainThread", (std::function<void()>) dispatchFunctionsFromMainThread);
44	}	44	}
45		45
46	} // namespace WTF	46	} // namespace WTF

Lines 100-106 void RunLoop::stop() a/Source/WTF/wtf/gtk/RunLoopGtk.cpp_sec1
- a/Source/WTF/wtf/gtk/RunLoopGtk.cpp -1 / +1 lines
100	void RunLoop::wakeUp()	100	void RunLoop::wakeUp()
101	{	101	{
102	ref();	102	ref();
103	GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] RunLoop work", std::bind(&RunLoop::performWork, this),	103	GMainLoopSource::createAndDeleteOnDestroy().schedule("[WebKit] RunLoop work", (std::function<void()>) std::bind(&RunLoop::performWork, this),
104	G_PRIORITY_DEFAULT, [this] { deref(); });	104	G_PRIORITY_DEFAULT, [this] { deref(); });
105	g_main_context_wakeup(m_runLoopContext.get());	105	g_main_context_wakeup(m_runLoopContext.get());
106	}	106	}

Return to Bug 130585

Lines 1-3 a/Source/WTF/ChangeLog_sec1
- a/Source/WTF/ChangeLog +17 lines
		1	2014-03-21 Andres Gomez <agomez@igalia.com>
		2
		3	[GTK] [EFL] Build fails with GCC < 4.8.x
		4	https://bugs.webkit.org/show_bug.cgi?id=130585
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	The behavior in lower versions of GCC seem to be related to
		9	http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-active.html#2132.
		10
		11	Provided explicit casts for the failing ambiguous overloads.
		12
		13	* wtf/gtk/MainThreadGtk.cpp:
		14	(WTF::scheduleDispatchFunctionsOnMainThread):
		15	* wtf/gtk/RunLoopGtk.cpp:
		16	(WTF::RunLoop::wakeUp):
		17
1	2014-03-20 Darin Adler <darin@apple.com>	18	2014-03-20 Darin Adler <darin@apple.com>
2		19
3	Fix a header guard mistake (harmless but clearly wrong)	20	Fix a header guard mistake (harmless but clearly wrong)