Attachment 339370 Details for Bug 185229 – ROLLOUT of r231251

[patch] ROLLOUT of r231251

bug-185229-20180502202644.patch (text/plain), 1.35 KB, created by WebKit Commit Bot on 2018-05-02 17:26:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2018-05-02 17:26:44 PDT

Size: 1.35 KB

patch

obsolete

>Subversion Revision: 231280
>diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
>index b29d96dd604c51399e8e271d14fc766837eeb86e..f0f705544e654e89acc8635ea392675f720c1c1b 100644
>--- a/Source/WTF/ChangeLog
>+++ b/Source/WTF/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-02  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r231251.
>+        https://bugs.webkit.org/show_bug.cgi?id=185229
>+
>+        __cpp_lib_optional should be used after including <optional>
>+        since it is defined in <optional> (Requested by yusukesuzuki
>+        on #webkit).
>+
>+        Reverted changeset:
>+
>+        "Follow-up build fix for r231223"
>+        https://bugs.webkit.org/show_bug.cgi?id=185159
>+        https://trac.webkit.org/changeset/231251
>+
> 2018-05-02  Jonathan Bedard  <jbedard@apple.com>
> 
>         Follow-up build fix for r231223
>diff --git a/Source/WTF/wtf/Optional.h b/Source/WTF/wtf/Optional.h
>index c6bf09c60b7ef489ca588b13e43a1cdca0e9b096..aac45a71c1b2f343c8bfd615a226d1b2334831f5 100644
>--- a/Source/WTF/wtf/Optional.h
>+++ b/Source/WTF/wtf/Optional.h
>@@ -47,9 +47,13 @@
> # include <wtf/Compiler.h>
> # include <wtf/StdLibExtras.h>
> 
>+#if !COMPILER(MSVC) && __has_include(<optional>)
>+# include <optional>
>+#endif
>+
> #if !COMPILER(MSVC) && defined(__cpp_lib_optional) && __cpp_lib_optional >= 201603
> 
>-# include <optional>
>+// Use default std::optional.
> 
> #else
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185229: 339370