Changeset 278319 in webkit

Timestamp:

Jun 1, 2021, 12:04:12 PM (5 years ago)

Author:

Chris Dumez

Message:

Unreviewed build fix after r278253.

Revert changes to ObjectiveCBlockConversions.swift and this is Swift's Optional<> not WTF's.

• SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift:

(ObjCBlockConversion.boxingNilAsAnyForCompatibility(_:Error:Error:)):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-06-01  Chris Dumez  <cdumez@apple.com>
+
+        Unreviewed build fix after r278253.
+
+        Revert changes to ObjectiveCBlockConversions.swift and this is Swift's Optional<> not WTF's.
+
+        * SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift:
+        (ObjCBlockConversion.boxingNilAsAnyForCompatibility(_:Error:Error:)):
+
 2021-06-01  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift

@@ -71 +71 @@
     ///
     /// This performs the same conversion as `Self.exclusive(_:)`, but if the result block is called
-    /// with `(nil, nil)` then `handler` is called with `.success(std::optional<Any>.none as Any)`. This
+    /// with `(nil, nil)` then `handler` is called with `.success(Optional<Any>.none as Any)`. This
     /// is a compatibility behavior for http://webkit.org/b/216198, and should not be adopted by
     /// new code.
@@ -81 +81 @@
                 handler(.success(success))
             } else {
-                handler(.success(std::optional<Any>.none as Any))
+                handler(.success(Optional<Any>.none as Any))
             }
         }