Title: [176269] trunk/Source/WTF
- Revision
- 176269
- Author
- [email protected]
- Date
- 2014-11-18 11:10:21 -0800 (Tue, 18 Nov 2014)
Log Message
[WinCairo] Compile errors when GStreamer is enabled.
https://bugs.webkit.org/show_bug.cgi?id=137000
Patch by [email protected] <[email protected]> on 2014-11-18
Reviewed by Philippe Normand.
MSVC does not allow the keyword default on move constructors and move assignment operators.
* wtf/gobject/GMainLoopSource.cpp:
(WTF::GMainLoopSource::cancel):
(WTF::GMainLoopSource::socketCallback):
* wtf/gobject/GMainLoopSource.h:
(WTF::GMainLoopSource::Context::operator=):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (176268 => 176269)
--- trunk/Source/WTF/ChangeLog 2014-11-18 19:08:26 UTC (rev 176268)
+++ trunk/Source/WTF/ChangeLog 2014-11-18 19:10:21 UTC (rev 176269)
@@ -1,3 +1,18 @@
+2014-11-18 [email protected] <[email protected]>
+
+ [WinCairo] Compile errors when GStreamer is enabled.
+ https://bugs.webkit.org/show_bug.cgi?id=137000
+
+ Reviewed by Philippe Normand.
+
+ MSVC does not allow the keyword default on move constructors and move assignment operators.
+
+ * wtf/gobject/GMainLoopSource.cpp:
+ (WTF::GMainLoopSource::cancel):
+ (WTF::GMainLoopSource::socketCallback):
+ * wtf/gobject/GMainLoopSource.h:
+ (WTF::GMainLoopSource::Context::operator=):
+
2014-11-17 Anders Carlsson <[email protected]>
Fix WTF build with newer versions of clang.
Modified: trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp (176268 => 176269)
--- trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp 2014-11-18 19:08:26 UTC (rev 176268)
+++ trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp 2014-11-18 19:10:21 UTC (rev 176269)
@@ -80,7 +80,8 @@
if (!m_context.source)
return;
- Context context = WTF::move(m_context);
+ Context context;
+ context = WTF::move(m_context);
context.destroySource();
}
@@ -421,7 +422,8 @@
if (!m_context.source)
return Stop;
- Context context = WTF::move(m_context);
+ Context context;
+ context = WTF::move(m_context);
ASSERT(context.socketCallback);
ASSERT(m_status == Scheduled || m_status == Dispatching);
Modified: trunk/Source/WTF/wtf/gobject/GMainLoopSource.h (176268 => 176269)
--- trunk/Source/WTF/wtf/gobject/GMainLoopSource.h 2014-11-18 19:08:26 UTC (rev 176268)
+++ trunk/Source/WTF/wtf/gobject/GMainLoopSource.h 2014-11-18 19:10:21 UTC (rev 176269)
@@ -76,8 +76,17 @@
struct Context {
Context() = default;
- Context(Context&&) = default;
- Context& operator=(Context&&) = default;
+ Context& operator=(Context&& c)
+ {
+ source = WTF::move(c.source);
+ cancellable = WTF::move(c.cancellable);
+ socketCancellable = WTF::move(c.socketCancellable);
+ voidCallback = WTF::move(c.voidCallback);
+ boolCallback = WTF::move(c.boolCallback);
+ socketCallback = WTF::move(c.socketCallback);
+ destroyCallback = WTF::move(c.destroyCallback);
+ return *this;
+ }
void destroySource();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
