Attachment 339322 Details for Bug 185198 – wip patch

[patch] wip patch

wip_185198.patch (text/plain), 2.62 KB, created by Carlos Alberto Lopez Perez on 2018-05-02 11:49:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Alberto Lopez Perez

Created: 2018-05-02 11:49:44 PDT

Size: 2.62 KB

patch

obsolete

>diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
>index 1391eadf8ed..31c2936911f 100644
>--- a/Source/WTF/wtf/Compiler.h
>+++ b/Source/WTF/wtf/Compiler.h
>@@ -74,6 +74,8 @@
> #define WTF_CPP_STD_VER 11
> #elif __cplusplus <= 201402L
> #define WTF_CPP_STD_VER 14
>+#elif __cplusplus <= 201703L
>+#define WTF_CPP_STD_VER 17
> #endif
> #endif
> 
>diff --git a/Source/WTF/wtf/Expected.h b/Source/WTF/wtf/Expected.h
>index e9b0ec9f9e6..f6523d9f623 100644
>--- a/Source/WTF/wtf/Expected.h
>+++ b/Source/WTF/wtf/Expected.h
>@@ -194,7 +194,7 @@ inline namespace fundamentals_v3 {
> struct unexpected_t {
>     unexpected_t() = default;
> };
>-#if __cplusplus < 201703L
>+#if __cplusplus <= 201703L
> #define __EXPECTED_INLINE_VARIABLE static const
> #else
> #define __EXPECTED_INLINE_VARIABLE inline
>diff --git a/Source/WTF/wtf/StdLibExtras.h b/Source/WTF/wtf/StdLibExtras.h
>index 49f2e2988d9..46c20cecec9 100644
>--- a/Source/WTF/wtf/StdLibExtras.h
>+++ b/Source/WTF/wtf/StdLibExtras.h
>@@ -534,7 +534,7 @@ ALWAYS_INLINE constexpr typename remove_reference<T>::type&& move(T&& value)
>     return move(forward<T>(value));
> }
> 
>-#if __cplusplus < 201703L && (!defined(_MSC_FULL_VER) || _MSC_FULL_VER < 190023918) && !defined(__cpp_lib_logical_traits)
>+#if __cplusplus <= 201703L && (!defined(_MSC_FULL_VER) || _MSC_FULL_VER < 190023918) && !defined(__cpp_lib_logical_traits)
> template<class...> struct wtf_conjunction_impl;
> template<> struct wtf_conjunction_impl<> : true_type { };
> template<class B0> struct wtf_conjunction_impl<B0> : B0 { };
>@@ -543,7 +543,7 @@ template<class B0, class B1, class B2, class... Bn> struct wtf_conjunction_impl<
> template<class... _Args> struct conjunction : wtf_conjunction_impl<_Args...> { };
> #endif
> 
>-#if __cplusplus < 201703L
>+#if __cplusplus <= 201703L
> 
> // These are inline variable for C++17 and later.
> #define __IN_PLACE_INLINE_VARIABLE static const
>@@ -564,7 +564,7 @@ template <size_t I> struct in_place_index_t {
> };
> template <size_t I>
> __IN_PLACE_INLINE_VARIABLE constexpr in_place_index_t<I> in_place_index { };
>-#endif // __cplusplus < 201703L
>+#endif // __cplusplus <= 201703L
> 
> enum class ZeroStatus {
>     MayBeZero,
>diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
>index 79cae5ff001..d2da23f37c5 100644
>--- a/Source/cmake/WebKitCompilerFlags.cmake
>+++ b/Source/cmake/WebKitCompilerFlags.cmake
>@@ -103,6 +103,7 @@ if (COMPILER_IS_GCC_OR_CLANG)
>     else ()
>         WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fno-exceptions)
>         WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-std=c++17
>+                                       -Wno-register
>                                        -fno-rtti)
> 
>         if (WIN32)

Actions: View | Formatted Diff | Diff

Attachments on bug 185198: 339322 | 339812 | 339822 | 339842 | 339946 | 339996 | 340303