Changeset 244660 in webkit

Timestamp:

Apr 25, 2019, 12:11:59 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Fix more builds after r244653
​https://bugs.webkit.org/show_bug.cgi?id=197131

Source/JavaScriptCore:

• b3/B3Value.h:

There is an older system with libc++ headers that don't have std::conjunction. Just use constexpr and && instead for the one use of it in WebKit.

Source/WebCore:

• svg/properties/SVGValuePropertyList.h:

Something is preventing MSVC from seeing protected constructors from subclasses.

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/b3/B3Value.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/properties/SVGValuePropertyList.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-04-25  Alex Christensen  <achristensen@webkit.org>
+
+        Fix more builds after r244653
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        * b3/B3Value.h:
+        There is an older system with libc++ headers that don't have std::conjunction.  Just use constexpr and && instead for the one use of it in WebKit.
+
 2019-04-25  Basuke Suzuki  <Basuke.Suzuki@sony.com>
 

trunk/Source/JavaScriptCore/b3/B3Value.h

@@ -335 +335 @@
     typedef int32_t OffsetType;
     template<typename Int>
-    struct IsLegalOffset : std::conjunction<
-        typename std::enable_if<std::is_integral<Int>::value>::type,
-        typename std::enable_if<std::is_signed<Int>::value>::type,
-        typename std::enable_if<sizeof(Int) <= sizeof(OffsetType)>::type
-    > { };
+    struct IsLegalOffset {
+        static constexpr bool value = std::is_integral<Int>::value
+            && std::is_signed<Int>::value
+            && sizeof(Int) <= sizeof(OffsetType);
+    };
 
 protected:

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-25  Alex Christensen  <achristensen@webkit.org>
+
+        Fix more builds after r244653
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        * svg/properties/SVGValuePropertyList.h:
+        Something is preventing MSVC from seeing protected constructors from subclasses.
+
 2019-04-25  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebCore/svg/properties/SVGValuePropertyList.h

@@ -67 +67 @@
     }
 
+    // Visual Studio doesn't seem to see these private constructors from subclasses.
+    // FIXME: See what it takes to remove this hack.
+#if !COMPILER(MSVC)
 protected:
+#endif
     using Base::append;
     using Base::remove;