Changeset 231353 in webkit

Timestamp:

May 4, 2018 8:35:29 AM (6 years ago)

Author:

Antti Koivisto

Message:

OptionsSet initializer list constructor should be constexpr
​https://bugs.webkit.org/show_bug.cgi?id=185298

Reviewed by Anders Carlsson.

• wtf/OptionSet.h:

(WTF::OptionSet::OptionSet):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/OptionSet.h (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-05-04  Antti Koivisto  <antti@apple.com>
+
+        OptionsSet initializer list constructor should be constexpr
+        https://bugs.webkit.org/show_bug.cgi?id=185298
+
+        Reviewed by Anders Carlsson.
+
+        * wtf/OptionSet.h:
+        (WTF::OptionSet::OptionSet):
+
 2018-05-03  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WTF/wtf/OptionSet.h

@@ -79 +79 @@
     {
     }
+
+    constexpr OptionSet(std::initializer_list<T> initializerList)
+    {
+        for (auto& option : initializerList)
+            m_storage |= static_cast<StorageType>(option);
+    }
 #else
     OptionSet(T t)
@@ -85 +91 @@
         ASSERT_WITH_MESSAGE(hasOneBitSet(static_cast<StorageType>(t)), "Enumerator is not a positive power of two.");
     }
-#endif
 
-    // FIXME: Make this constexpr once we adopt C++14 as C++11 does not support for-loops
-    // in a constexpr function.
     OptionSet(std::initializer_list<T> initializerList)
     {
@@ -96 +99 @@
         }
     }
+#endif
 
     constexpr StorageType toRaw() const { return m_storage; }