[webkit-changes] [279064] trunk/Source/WTF

Mon, 21 Jun 2021 01:36:17 -0700

Title: [279064] trunk/Source/WTF
Revision
279064
Author
ph...@webkit.org
Date
2021-06-21 01:36:09 -0700 (Mon, 21 Jun 2021)

Log Message

Unreviewed build fix after r279062

* wtf/Span.h:
(std::is_convertible_v<std::remove_pointer_t<decltype):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (279063 => 279064)


--- trunk/Source/WTF/ChangeLog	2021-06-21 07:53:39 UTC (rev 279063)
+++ trunk/Source/WTF/ChangeLog	2021-06-21 08:36:09 UTC (rev 279064)
@@ -1,3 +1,10 @@
+2021-06-21  Philippe Normand  <pnorm...@igalia.com>
+
+        Unreviewed build fix after r279062
+
+        * wtf/Span.h:
+        (std::is_convertible_v<std::remove_pointer_t<decltype):
+
 2021-06-20  Sam Weinig  <wei...@apple.com>
 
         Replace Span implementation with one from libc++, which is more spec complient

Modified: trunk/Source/WTF/wtf/Span.h (279063 => 279064)


--- trunk/Source/WTF/wtf/Span.h	2021-06-21 07:53:39 UTC (rev 279063)
+++ trunk/Source/WTF/wtf/Span.h	2021-06-21 08:36:09 UTC (rev 279064)
@@ -71,11 +71,11 @@
 struct __is_span_compatible_container<_Tp, _ElementType,
         std::void_t<
         // is not a specialization of Span
-            typename std::enable_if<!__is_span<_Tp>::value, nullptr_t>::type,
+            typename std::enable_if<!__is_span<_Tp>::value, std::nullptr_t>::type,
         // is not a specialization of array
-            typename std::enable_if<!__is_std_array<_Tp>::value, nullptr_t>::type,
+            typename std::enable_if<!__is_std_array<_Tp>::value, std::nullptr_t>::type,
         // sd::is_array_v<Container> is false,
-            typename std::enable_if<!std::is_array_v<_Tp>, nullptr_t>::type,
+            typename std::enable_if<!std::is_array_v<_Tp>, std::nullptr_t>::type,
         // std::data(cont) and std::size(cont) are well formed
             decltype(std::data(std::declval<_Tp>())),
             decltype(std::size(std::declval<_Tp>())),
@@ -83,7 +83,7 @@
             typename std::enable_if<
                 std::is_convertible_v<std::remove_pointer_t<decltype(std::data(std::declval<_Tp &>()))>(*)[],
                                  _ElementType(*)[]>,
-                nullptr_t>::type
+                std::nullptr_t>::type
         >>
     : public std::true_type {};
 
@@ -110,7 +110,7 @@
     static constexpr size_type extent = _Extent;
 
 // [span.cons], span constructors, copy, assignment, and destructor
-    template <std::size_t _Sz = _Extent, std::enable_if_t<_Sz == 0, nullptr_t> = nullptr>
+    template <std::size_t _Sz = _Extent, std::enable_if_t<_Sz == 0, std::nullptr_t> = nullptr>
     _WTF_LIBCPP_INLINE_VISIBILITY constexpr Span() noexcept : __data{nullptr} {}
 
     constexpr Span           (const Span&) noexcept = default;
@@ -124,12 +124,12 @@
     _WTF_LIBCPP_INLINE_VISIBILITY constexpr Span(element_type (&__arr)[_Extent])          noexcept : __data{__arr} {}
 
     template <class _OtherElementType,
-              std::enable_if_t<std::is_convertible_v<_OtherElementType(*)[], element_type (*)[]>, nullptr_t> = nullptr>
+              std::enable_if_t<std::is_convertible_v<_OtherElementType(*)[], element_type (*)[]>, std::nullptr_t> = nullptr>
     _WTF_LIBCPP_INLINE_VISIBILITY
     constexpr Span(std::array<_OtherElementType, _Extent>& __arr) noexcept : __data{__arr.data()} {}
 
     template <class _OtherElementType,
-              std::enable_if_t<std::is_convertible_v<const _OtherElementType(*)[], element_type (*)[]>, nullptr_t> = nullptr>
+              std::enable_if_t<std::is_convertible_v<const _OtherElementType(*)[], element_type (*)[]>, std::nullptr_t> = nullptr>
     _WTF_LIBCPP_INLINE_VISIBILITY
     constexpr Span(const std::array<_OtherElementType, _Extent>& __arr) noexcept : __data{__arr.data()} {}
 
@@ -136,7 +136,7 @@
     template <class _Container>
     _WTF_LIBCPP_INLINE_VISIBILITY
         constexpr explicit Span(      _Container& __c,
-            std::enable_if_t<__is_span_compatible_container<_Container, _Tp>::value, nullptr_t> = nullptr)
+            std::enable_if_t<__is_span_compatible_container<_Container, _Tp>::value, std::nullptr_t> = nullptr)
         : __data{_WTF_VSTD::data(__c)} {
             _WTF_LIBCPP_ASSERT(_Extent == _WTF_VSTD::size(__c), "size mismatch in Span's constructor (range)");
         }
@@ -144,7 +144,7 @@
     template <class _Container>
     _WTF_LIBCPP_INLINE_VISIBILITY
         constexpr explicit Span(const _Container& __c,
-            std::enable_if_t<__is_span_compatible_container<const _Container, _Tp>::value, nullptr_t> = nullptr)
+            std::enable_if_t<__is_span_compatible_container<const _Container, _Tp>::value, std::nullptr_t> = nullptr)
         : __data{_WTF_VSTD::data(__c)} {
             _WTF_LIBCPP_ASSERT(_Extent == _WTF_VSTD::size(__c), "size mismatch in Span's constructor (range)");
         }
@@ -154,7 +154,7 @@
         constexpr Span(const Span<_OtherElementType, _Extent>& __other,
                        std::enable_if_t<
                           std::is_convertible_v<_OtherElementType(*)[], element_type (*)[]>,
-                          nullptr_t> = nullptr)
+                          std::nullptr_t> = nullptr)
         : __data{__other.data()} {}
 
     template <class _OtherElementType>
@@ -162,7 +162,7 @@
         constexpr explicit Span(const Span<_OtherElementType>& __other,
                        std::enable_if_t<
                           std::is_convertible_v<_OtherElementType(*)[], element_type (*)[]>,
-                          nullptr_t> = nullptr) noexcept
+                          std::nullptr_t> = nullptr) noexcept
         : __data{__other.data()} { _WTF_LIBCPP_ASSERT(_Extent == __other.size(), "size mismatch in Span's constructor (other Span)"); }
 
 
@@ -296,12 +296,12 @@
     constexpr Span(element_type (&__arr)[_Sz])          noexcept : __data{__arr}, __size{_Sz} {}
 
     template <class _OtherElementType, std::size_t _Sz,
-              std::enable_if_t<std::is_convertible_v<_OtherElementType(*)[], element_type (*)[]>, nullptr_t> = nullptr>
+              std::enable_if_t<std::is_convertible_v<_OtherElementType(*)[], element_type (*)[]>, std::nullptr_t> = nullptr>
     _WTF_LIBCPP_INLINE_VISIBILITY
     constexpr Span(std::array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}
 
     template <class _OtherElementType, std::size_t _Sz,
-              std::enable_if_t<std::is_convertible_v<const _OtherElementType(*)[], element_type (*)[]>, nullptr_t> = nullptr>
+              std::enable_if_t<std::is_convertible_v<const _OtherElementType(*)[], element_type (*)[]>, std::nullptr_t> = nullptr>
     _WTF_LIBCPP_INLINE_VISIBILITY
     constexpr Span(const std::array<_OtherElementType, _Sz>& __arr) noexcept : __data{__arr.data()}, __size{_Sz} {}
 
@@ -308,13 +308,13 @@
     template <class _Container>
     _WTF_LIBCPP_INLINE_VISIBILITY
         constexpr Span(      _Container& __c,
-            std::enable_if_t<__is_span_compatible_container<_Container, _Tp>::value, nullptr_t> = nullptr)
+            std::enable_if_t<__is_span_compatible_container<_Container, _Tp>::value, std::nullptr_t> = nullptr)
         : __data{_WTF_VSTD::data(__c)}, __size{(size_type) _WTF_VSTD::size(__c)} {}
 
     template <class _Container>
     _WTF_LIBCPP_INLINE_VISIBILITY
         constexpr Span(const _Container& __c,
-            std::enable_if_t<__is_span_compatible_container<const _Container, _Tp>::value, nullptr_t> = nullptr)
+            std::enable_if_t<__is_span_compatible_container<const _Container, _Tp>::value, std::nullptr_t> = nullptr)
         : __data{_WTF_VSTD::data(__c)}, __size{(size_type) _WTF_VSTD::size(__c)} {}
 
 
@@ -323,7 +323,7 @@
         constexpr Span(const Span<_OtherElementType, _OtherExtent>& __other,
                        std::enable_if_t<
                           std::is_convertible_v<_OtherElementType(*)[], element_type (*)[]>,
-                          nullptr_t> = nullptr) noexcept
+                          std::nullptr_t> = nullptr) noexcept
         : __data{__other.data()}, __size{__other.size()} {}
 
 //    ~Span() noexcept = default;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to