dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 3rd party optional wrapper, always use local verison on Apple

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-02-16 14:01:01 +00:00
parent 6089347833
commit 0d385c9688
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdparty/optional/ottd_optional.h vendored
View File

@@ -16,7 +16,7 @@
# endif
#endif
#if (__cplusplus >= 201703L) || (defined(__cpp_lib_optional) && __cpp_lib_optional >= 201606L)
#if !defined(__APPLE__) && ((__cplusplus >= 201703L) || (defined(__cpp_lib_optional) && __cpp_lib_optional >= 201606L))
/* Native std::optional. */
#include <optional>
@@ -26,7 +26,7 @@ namespace opt = std;
/* No std::optional, use local copy instead. */
#include "optional.hpp"
namespace opt = std::experimental;
namespace opt = ottd_optional;
#endif