Title: [231251] trunk/Source/WTF
- Revision
- 231251
- Author
- [email protected]
- Date
- 2018-05-02 11:54:27 -0700 (Wed, 02 May 2018)
Log Message
Follow-up build fix for r231223
https://bugs.webkit.org/show_bug.cgi?id=185159
<rdar://problem/39891074>
Unreviewed build fix.
We should be consistent about when we include <optional> vs define our own.
* wtf/Optional.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (231250 => 231251)
--- trunk/Source/WTF/ChangeLog 2018-05-02 18:51:16 UTC (rev 231250)
+++ trunk/Source/WTF/ChangeLog 2018-05-02 18:54:27 UTC (rev 231251)
@@ -1,3 +1,15 @@
+2018-05-02 Jonathan Bedard <[email protected]>
+
+ Follow-up build fix for r231223
+ https://bugs.webkit.org/show_bug.cgi?id=185159
+ <rdar://problem/39891074>
+
+ Unreviewed build fix.
+
+ We should be consistent about when we include <optional> vs define our own.
+
+ * wtf/Optional.h:
+
2018-05-02 Jer Noble <[email protected]>
Enable HAVE_AVKIT for the MINIMAL_SIMULATOR
Modified: trunk/Source/WTF/wtf/Optional.h (231250 => 231251)
--- trunk/Source/WTF/wtf/Optional.h 2018-05-02 18:51:16 UTC (rev 231250)
+++ trunk/Source/WTF/wtf/Optional.h 2018-05-02 18:54:27 UTC (rev 231251)
@@ -47,13 +47,9 @@
# 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
-// Use default std::optional.
+# include <optional>
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
