diff options
| -rw-r--r-- | java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h | 17 | ||||
| -rw-r--r-- | www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h | 17 |
2 files changed, 34 insertions, 0 deletions
diff --git a/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h new file mode 100644 index 000000000000..e5b6835d430b --- /dev/null +++ b/java/openjfx8-devel/files/patch-modules_web_src_main_native_Source_WTF_wtf_Optional.h @@ -0,0 +1,17 @@ +--- modules/web/src/main/native/Source/WTF/wtf/Optional.h.orig 2018-03-23 23:53:57 UTC ++++ modules/web/src/main/native/Source/WTF/wtf/Optional.h +@@ -295,12 +295,14 @@ struct nullopt_t + constexpr nullopt_t nullopt{nullopt_t::init()}; + + ++# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000 + // 20.5.8, class bad_optional_access + class bad_optional_access : public std::logic_error { + public: + explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {} + explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {} + }; ++# endif // _LIBCPP_VERSION < 7000 + + + template <class T> diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h new file mode 100644 index 000000000000..01d37ea18ae0 --- /dev/null +++ b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h @@ -0,0 +1,17 @@ +--- Source/WTF/wtf/Optional.h.orig 2018-02-19 07:45:30 UTC ++++ Source/WTF/wtf/Optional.h +@@ -291,12 +291,14 @@ struct nullopt_t + constexpr nullopt_t nullopt{nullopt_t::init()}; + + ++# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000 + // 20.5.8, class bad_optional_access + class bad_optional_access : public std::logic_error { + public: + explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {} + explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {} + }; ++# endif // _LIBCPP_VERSION < 7000 + + + template <class T> |