Title: [256590] releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE
Revision
256590
Author
[email protected]
Date
2020-02-14 01:39:55 -0800 (Fri, 14 Feb 2020)

Log Message

Merge r256491 - Multiple GCC 10 build failures in ANGLE
https://bugs.webkit.org/show_bug.cgi?id=207365

Patch by Michael Catanzaro <[email protected]> on 2020-02-12
Reviewed by Carlos Alberto Lopez Perez.

* changes.diff: Updated.
* include/platform/Platform.h: Add missing #include to get size_t.
* src/common/PackedEnums.h: Remove problematic const_casts.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/ChangeLog (256589 => 256590)


--- releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/ChangeLog	2020-02-14 09:39:50 UTC (rev 256589)
+++ releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/ChangeLog	2020-02-14 09:39:55 UTC (rev 256590)
@@ -1,3 +1,14 @@
+2020-02-12  Michael Catanzaro  <[email protected]>
+
+        Multiple GCC 10 build failures in ANGLE
+        https://bugs.webkit.org/show_bug.cgi?id=207365
+
+        Reviewed by Carlos Alberto Lopez Perez.
+
+        * changes.diff: Updated.
+        * include/platform/Platform.h: Add missing #include to get size_t.
+        * src/common/PackedEnums.h: Remove problematic const_casts.
+
 2019-09-24  Adrian Perez de Castro  <[email protected]>
 
         [GTK] ANGLE's eglplatform.h is build broken with -DENABLE_X11_PLATFORM=OFF

Modified: releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/include/platform/Platform.h (256589 => 256590)


--- releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/include/platform/Platform.h	2020-02-14 09:39:50 UTC (rev 256589)
+++ releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/include/platform/Platform.h	2020-02-14 09:39:55 UTC (rev 256590)
@@ -9,6 +9,7 @@
 #ifndef ANGLE_PLATFORM_H
 #define ANGLE_PLATFORM_H
 
+#include <stdlib.h>
 #include <stdint.h>
 #include <array>
 

Modified: releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/src/common/PackedEnums.h (256589 => 256590)


--- releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/src/common/PackedEnums.h	2020-02-14 09:39:50 UTC (rev 256589)
+++ releases/WebKitGTK/webkit-2.26/Source/ThirdParty/ANGLE/src/common/PackedEnums.h	2020-02-14 09:39:55 UTC (rev 256590)
@@ -83,10 +83,7 @@
         // We use a for loop instead of range-for to work around a limitation in MSVC.
         for (const InitPair *it = init.begin(); it != init.end(); ++it)
         {
-            // This horrible const_cast pattern is necessary to work around a constexpr limitation.
-            // See https://stackoverflow.com/q/34199774/ . Note that it should be fixed with C++17.
-            const_cast<T &>(const_cast<const Storage &>(
-                mPrivateData)[static_cast<UnderlyingType>(it->first)]) = it->second;
+            mPrivateData[static_cast<UnderlyingType>(it->first)] = it->second;
         }
     }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to