Fix a GCC 10 build failure.

Build failed on GCC10 with C++17. An #ifdef was added to support both C++17 and C++14 Bug: angleproject:4390 Change-Id: I397513a8ebad4a55635ba863c47edc658e405729 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2063545 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Fix a GCC 10 build failure.
f031f7c8 · Pierre-Marc Berube · Commit Bot · 46cb0f62 · f031f7c8
Commit f031f7c8 authored Feb 19, 2020 by Pierre-Marc Berube Committed by Commit Bot Feb 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

PackedEnums.h src/common/PackedEnums.h +4 -0

No files found.
--- a/src/common/PackedEnums.h
+++ b/src/common/PackedEnums.h
@@ -83,10 +83,14 @@ class PackedEnumMap
        // 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)
        {
+#if (__cplusplus < 201703L)
            // 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;
+#else
+            mPrivateData[static_cast<UnderlyingType>(it->first)] = it->second;
+#endif
        }
    }