Skip to content

[WiP] Remove <experimental/optional> hack from util/optional.h #2640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
uklotzde wants to merge 2 commits into from
Closed

[WiP] Remove <experimental/optional> hack from util/optional.h #2640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
604977d
Remove <experimental/optional> hack from util/optional.h
uklotzde Apr 9, 2020
8f0c338
TravisCI: Downgrade XCode from 11.0 to 9.3
uklotzde Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:

- name: OSX/clang/SCons build
os: osx
osx_image: xcode11
osx_image: xcode9.3
compiler: clang
cache:
directories:
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:

- name: OSX/clang/CMake build
os: osx
osx_image: xcode11
osx_image: xcode9.3
compiler: clang
cache:
ccache: true
Expand Down
21 changes: 0 additions & 21 deletions src/util/optional.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down