Follow-up build fix for r231223

JonWBedard · JonWBedard · commit 89dff13c03fd · 2018-05-02T18:54:27.000Z
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: Canonical link: https://commits.webkit.org/200695@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@231251 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
@@ -1,3 +1,15 @@
+2018-05-02  Jonathan Bedard  <jbedard@apple.com>
+
+        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  <jer.noble@apple.com>
 
         Enable HAVE_AVKIT for the MINIMAL_SIMULATOR
diff --git a/Source/WTF/wtf/Optional.h b/Source/WTF/wtf/Optional.h
@@ -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
 
