Changeset 176269 in webkit

Timestamp:

Nov 18, 2014 11:10:21 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[WinCairo] Compile errors when GStreamer is enabled.
​https://bugs.webkit.org/show_bug.cgi?id=137000

Patch by ​peavo@outlook.com <​peavo@outlook.com> 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=):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/gobject/GMainLoopSource.cpp (modified) (2 diffs)
• wtf/gobject/GMainLoopSource.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-11-18  peavo@outlook.com  <peavo@outlook.com>
+
+        [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  <andersca@apple.com>
 

trunk/Source/WTF/wtf/gobject/GMainLoopSource.cpp

@@ -81 +81 @@
         return;
 
-    Context context = WTF::move(m_context);
+    Context context;
+    context = WTF::move(m_context);
     context.destroySource();
 }
@@ -422 +423 @@
         return Stop;
 
-    Context context = WTF::move(m_context);
+    Context context;
+    context = WTF::move(m_context);
 
     ASSERT(context.socketCallback);

trunk/Source/WTF/wtf/gobject/GMainLoopSource.h

@@ -77 +77 @@
     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();