Title: [244660] trunk/Source
- Revision
- 244660
- Author
- [email protected]
- Date
- 2019-04-25 12:11:59 -0700 (Thu, 25 Apr 2019)
Log Message
Fix more builds after r244653
https://bugs.webkit.org/show_bug.cgi?id=197131
Source/_javascript_Core:
* 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.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (244659 => 244660)
--- trunk/Source/_javascript_Core/ChangeLog 2019-04-25 19:04:46 UTC (rev 244659)
+++ trunk/Source/_javascript_Core/ChangeLog 2019-04-25 19:11:59 UTC (rev 244660)
@@ -1,3 +1,11 @@
+2019-04-25 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
[RemoteInspector] Fix connection and target identifier types.
Modified: trunk/Source/_javascript_Core/b3/B3Value.h (244659 => 244660)
--- trunk/Source/_javascript_Core/b3/B3Value.h 2019-04-25 19:04:46 UTC (rev 244659)
+++ trunk/Source/_javascript_Core/b3/B3Value.h 2019-04-25 19:11:59 UTC (rev 244660)
@@ -334,11 +334,11 @@
// of B3 to force them to reason about the target's offset.
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:
Value* cloneImpl() const;
Modified: trunk/Source/WebCore/ChangeLog (244659 => 244660)
--- trunk/Source/WebCore/ChangeLog 2019-04-25 19:04:46 UTC (rev 244659)
+++ trunk/Source/WebCore/ChangeLog 2019-04-25 19:11:59 UTC (rev 244660)
@@ -1,3 +1,11 @@
+2019-04-25 Alex Christensen <[email protected]>
+
+ 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 <[email protected]>
-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:] never returns _WKWebsiteDataTypeCredentials
Modified: trunk/Source/WebCore/svg/properties/SVGValuePropertyList.h (244659 => 244660)
--- trunk/Source/WebCore/svg/properties/SVGValuePropertyList.h 2019-04-25 19:04:46 UTC (rev 244659)
+++ trunk/Source/WebCore/svg/properties/SVGValuePropertyList.h 2019-04-25 19:11:59 UTC (rev 244660)
@@ -66,7 +66,11 @@
remove(size() - 1);
}
+ // 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;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
