From b44eaac6af56dfaf23ef32e6afff899c40812ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ing=2E=20Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?=
<jan.travnicek@fit.cvut.cz>
Date: Sat, 24 Nov 2018 13:58:02 +0100
Subject: [PATCH] Revert include optional from experimental library
---
alib2gui/src/Converter.hpp | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/alib2gui/src/Converter.hpp b/alib2gui/src/Converter.hpp
index b90ef9838f..f17c5f8044 100644
--- a/alib2gui/src/Converter.hpp
+++ b/alib2gui/src/Converter.hpp
@@ -1,18 +1,7 @@
#pragma once
#include <tuple>
-
-#if __has_include(<optional>) && __cplusplus >= 201703L //FIXME has_include to allow build on gitlab-ci with alpine 3.7
- #include <optional>
-#else
- #include <experimental/optional>
- namespace std {
- template < class T >
- using optional = experimental::optional < T >;
-
- constexpr auto nullopt = std::experimental::nullopt;
- }
-#endif
+#include <optional>
#include <QString>
#include <QImage>
--
GitLab