Remove obsolete pre-C++17 workarounds in util/optional.h

1 files changed, 1 insertions, 27 deletions

diff --git a/src/util/optional.h b/src/util/optional.h
index f32b8b6402..d62cc69f46 100644
--- a/src/util/optional.h
+++ b/src/util/optional.h
@@ -1,33 +1,7 @@
 #pragma once
 
-#if __has_include(<optional>) || \
-    (defined(__cpp_lib_optional) && __cpp_lib_optional >= 201606L)
-
-#include <optional>
-
-#else
-
-#ifdef __clang__
-#pragma clang diagnostic ignored "-Winvalid-constexpr"
-#endif
-
-#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>
+#include <optional>
 
 template<typename T>
 QDebug operator<<(QDebug dbg, std::optional<T> arg) {