Changeset 244656 in webkit

Timestamp:

Apr 25, 2019 11:49:20 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Source/WebCore:
Fix MSVC build after r244653
​https://bugs.webkit.org/show_bug.cgi?id=197131

• svg/properties/SVGValueProperty.h:

MSVC doesn't think it can access these protected constructors from subclasses.
Make the build work and investigate this later.

Source/WTF:
Fix High Sierra build after r244653
​https://bugs.webkit.org/show_bug.cgi?id=197131

• wtf/StdLibExtras.h:

High Sierra thinks cplusplus is 201406 even when using C++17.
Removing the cplusplus check resolves the build failure on High Sierra.
We can clean up StdLibExtras more later.

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/StdLibExtras.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/properties/SVGValueProperty.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-04-25  Alex Christensen  <achristensen@webkit.org>
+
+        Fix High Sierra build after r244653
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        * wtf/StdLibExtras.h:
+        High Sierra thinks __cplusplus is 201406 even when using C++17.
+        Removing the __cplusplus check resolves the build failure on High Sierra.
+        We can clean up StdLibExtras more later.
+
 2019-04-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/StdLibExtras.h

@@ -528 +528 @@
 // Provide in_place_t when not building with -std=c++17, or when building with libstdc++ 6
 // (which doesn't define the _GLIBCXX_RELEASE macro that's been introduced in libstdc++ 7).
-#if (__cplusplus < 201703L || (defined(__GLIBCXX__) && !defined(_GLIBCXX_RELEASE))) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201703L)
+#if ((defined(__GLIBCXX__) && !defined(_GLIBCXX_RELEASE))) && (!defined(_MSVC_LANG) || _MSVC_LANG < 201703L)
 
 // These are inline variable for C++17 and later.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-25  Alex Christensen  <achristensen@webkit.org>
+
+        Fix MSVC build after r244653
+        https://bugs.webkit.org/show_bug.cgi?id=197131
+
+        * svg/properties/SVGValueProperty.h:
+        MSVC doesn't think it can access these protected constructors from subclasses.
+        Make the build work and investigate this later.
+
 2019-04-25  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -47 +47 @@
     PropertyType& value() { return m_value; }
 
+    // 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
     // Create an initialized property, e.g creating an item to be appended in an SVGList.
     SVGValueProperty(const PropertyType& value)