From 604977d609f384b4a6618481c332e3b246938f7b Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Thu, 9 Apr 2020 19:12:26 +0200
Subject: [PATCH 1/2] Remove <experimental/optional> hack from util/optional.h

---
 src/util/optional.h | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/util/optional.h b/src/util/optional.h
index 6fe9139b0c3a..9ab8bdef458f 100644
--- a/src/util/optional.h
+++ b/src/util/optional.h
@@ -1,28 +1,7 @@
 #pragma once
 
-#if __has_include(<optional>) || \
-    (defined(__cpp_lib_optional) && __cpp_lib_optional >= 201606L)
-
 #include <optional>
 
-#else
-
-#include <experimental/optional>
-
-namespace std {
-
-using std::experimental::make_optional;
-using std::experimental::nullopt;
-using std::experimental::optional;
-
-// Workarounds for missing member functions:
-// option::has_value() -> explicit operator bool()
-// option::value() -> operator*()
-
-} // namespace std
-
-#endif
-
 #include <QtDebug>
 
 template<typename T>

From 8f0c338ff8d3bf4ec3fea9ec7c7db483af251531 Mon Sep 17 00:00:00 2001
From: Uwe Klotz <uklotz@mixxx.org>
Date: Thu, 9 Apr 2020 22:32:31 +0200
Subject: [PATCH 2/2] TravisCI: Downgrade XCode from 11.0 to 9.3

...to match our build server that is running macOS 10.13
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5287e8ede65d..0a53cce8832a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,7 +91,7 @@ jobs:
 
     - name: OSX/clang/SCons build
       os: osx
-      osx_image: xcode11
+      osx_image: xcode9.3
       compiler: clang
       cache:
         directories:
@@ -127,7 +127,7 @@ jobs:
 
     - name: OSX/clang/CMake build
       os: osx
-      osx_image: xcode11
+      osx_image: xcode9.3
       compiler: clang
       cache:
         ccache: true