Changeset 182254 in webkit

Timestamp:

Apr 1, 2015 2:01:24 PM (9 years ago)

Author:

Antti Koivisto

Message:

015-04-01 Antti Koivisto <Antti Koivisto>

Value assignment operator of Optional should be stricter
​https://bugs.webkit.org/show_bug.cgi?id=143303

Reviewed by Andreas Kling.

struct Foo { mutable Optional<std::chrono::seconds> s; };
Foo foo, foo2;
foo = foo2;

doesn't build because it tries to use wrong operator=.

• wtf/Optional.h:

Add enable_if test similar to std::experimental::optional.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Optional.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+015-04-01  Antti Koivisto  <antti@apple.com>
+
+        Value assignment operator of Optional should be stricter
+        https://bugs.webkit.org/show_bug.cgi?id=143303
+
+        Reviewed by Andreas Kling.
+
+        struct Foo { mutable Optional<std::chrono::seconds> s; };
+        Foo foo, foo2;
+        foo = foo2;
+
+        doesn't build because it tries to use wrong operator=.
+
+        * wtf/Optional.h:
+
+            Add enable_if test similar to std::experimental::optional.
+
 2015-04-01  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/Optional.h

@@ -123 +123 @@
     }
 
-    template<typename U>
+    template<typename U, class = typename std::enable_if<std::is_same<typename std::remove_reference<U>::type, T>::value>::type>
     Optional& operator=(U&& u)
     {