Title: [231281] trunk/Source/WTF
- Revision
- 231281
- Author
- [email protected]
- Date
- 2018-05-02 17:28:27 -0700 (Wed, 02 May 2018)
Log Message
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
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (231280 => 231281)
--- trunk/Source/WTF/ChangeLog 2018-05-02 23:10:37 UTC (rev 231280)
+++ trunk/Source/WTF/ChangeLog 2018-05-03 00:28:27 UTC (rev 231281)
@@ -1,3 +1,18 @@
+2018-05-02 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
Follow-up build fix for r231223
Modified: trunk/Source/WTF/wtf/Optional.h (231280 => 231281)
--- trunk/Source/WTF/wtf/Optional.h 2018-05-02 23:10:37 UTC (rev 231280)
+++ trunk/Source/WTF/wtf/Optional.h 2018-05-03 00:28:27 UTC (rev 231281)
@@ -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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
