Merge branch 'release/0.4.2'

MonoMotion · Feb 4, 2019 · a6c75c0 · a6c75c0
2 parents d35bd0c + 54dc083
commit a6c75c0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 35 deletions.
diff --git a/ci/scripts/linux/script.sh b/ci/scripts/linux/script.sh
@@ -18,4 +18,4 @@
 # along with Flom.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-travis_wait 30 docker run --rm -v $(pwd):/source -v $(pwd)/build:/build -e BUILD_TYPE=${BUILD_TYPE} -e CXX=${COMPILER} -e ENABLE_TEST=${ENABLE_TEST} -e RC_PARAMS="${RC_PARAMS}" test
+travis_wait 45 docker run --rm -v $(pwd):/source -v $(pwd)/build:/build -e BUILD_TYPE=${BUILD_TYPE} -e CXX=${COMPILER} -e ENABLE_TEST=${ENABLE_TEST} -e RC_PARAMS="${RC_PARAMS}" test
diff --git a/include/flom/compat/optional.hpp b/include/flom/compat/optional.hpp
@@ -22,16 +22,6 @@
 
 #include <cstddef>
 
-
-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20190108)
-//
-// some libstdc++ implementation of std::optional doesn't allow
-// to hold a type with non-trivial copy ctor, so use boost::optional instead
-//
-// fixed in PR libstdc++/87854
-// https://github.com/gcc-mirror/gcc/commit/58e897da03b9a1aaf6861951806c7a8e15de1546
-//
-
 #include <boost/optional.hpp>
 
 namespace flom::compat {
@@ -40,28 +30,4 @@ using optional = boost::optional<T>;
 static inline auto nullopt = boost::none;
 }
 
-#elif __has_include(<optional>)
-
-#include <optional>
-
-namespace flom::compat {
-template<typename T>
-using optional = std::optional<T>;
-inline constexpr auto nullopt = std::nullopt;
-}
-
-#elif __has_include(<experimental/optional>)
-
-#include <experimental/optional>
-
-namespace flom::compat {
-template<typename T>
-using optional = std::experimental::optional<T>;
-inline constexpr auto nullopt = std::experimental::nullopt;
-}
-
-#else
-#error Could not find optional header
-#endif
-
 #endif