Attachment 196436 Details for Bug 230464 – Stop Optional.h from defining its own bad_optional_access

[patch] Stop Optional.h from defining its own bad_optional_access

www__webkit2-gtk3-fix-optional-1.diff (text/plain), 1.24 KB, created by Dimitry Andric on 2018-08-22 06:00:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2018-08-22 06:00:07 UTC

Size: 1.24 KB

patch

obsolete

>Index: www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h
>===================================================================
>--- www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h	(nonexistent)
>+++ www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h	(working copy)
>@@ -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>
>
>Property changes on: www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 230464: 196436