Use __has_include to detect std::optional

jhasse · Jun 20, 2019 · 99b5fb3 · 99b5fb3
1 parent c3d5ccb
commit 99b5fb3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/main.hpp b/src/main.hpp
@@ -9,12 +9,12 @@
 #include <memory>
 #include <string>
 #include <vector>
-#ifdef __APPLE__
+#if defined(__has_include) && __has_include(<optional>)
+#include <optional>
+template <class T> using optional = std::optional<T>;
+#else
 #include <experimental/optional>
 using std::experimental::optional;
-#else
-#include <optional>
-using std::optional;
 #endif
 
 namespace jngl {

diff --git a/src/sdl/windowimpl.hpp b/src/sdl/windowimpl.hpp
@@ -2,14 +2,14 @@
 
 #include "sdl.hpp"
 
-#ifdef __APPLE__
+#if defined(__has_include) && __has_include(<optional>)
+#include <optional>
+template <class T> using optional = std::optional<T>;
+using std::nullopt;
+#else
 #include <experimental/optional>
 using std::experimental::optional;
 using std::experimental::nullopt;
-#else
-#include <optional>
-using std::optional;
-using std::nullopt;
 #endif
 
 namespace jngl {