<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[170202] trunk/Source/WTF</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/170202">170202</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 13:54:57 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add copy/move constructors and assignment operators to WTF::Optional
https://bugs.webkit.org/show_bug.cgi?id=134119
Reviewed by Andreas Kling.
* wtf/Optional.h:
(WTF::Optional::Optional):
(WTF::Optional::operator=):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfOptionalh">trunk/Source/WTF/wtf/Optional.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (170201 => 170202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-06-20 20:48:13 UTC (rev 170201)
+++ trunk/Source/WTF/ChangeLog 2014-06-20 20:54:57 UTC (rev 170202)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-06-20 Anders Carlsson <andersca@apple.com>
+
+ Add copy/move constructors and assignment operators to WTF::Optional
+ https://bugs.webkit.org/show_bug.cgi?id=134119
+
+ Reviewed by Andreas Kling.
+
+ * wtf/Optional.h:
+ (WTF::Optional::Optional):
+ (WTF::Optional::operator=):
+
</ins><span class="cx"> 2014-06-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WTF::Optional class
</span></span></pre></div>
<a id="trunkSourceWTFwtfOptionalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Optional.h (170201 => 170202)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Optional.h 2014-06-20 20:48:13 UTC (rev 170201)
+++ trunk/Source/WTF/wtf/Optional.h 2014-06-20 20:54:57 UTC (rev 170202)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <type_traits>
</span><span class="cx"> #include <wtf/Assertions.h>
</span><ins>+#include <wtf/StdLibExtras.h>
</ins><span class="cx">
</span><span class="cx"> // WTF::Optional is a class based on std::optional, described here:
</span><span class="cx"> // http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2013/n3527.html
</span><span class="lines">@@ -57,6 +58,20 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Optional(const Optional& other)
+ : m_isEngaged(other.m_isEngaged)
+ {
+ if (m_isEngaged)
+ new (NotNull, std::addressof(m_value)) T(other.m_value);
+ }
+
+ Optional(Optional&& other)
+ : m_isEngaged(other.m_isEngaged)
+ {
+ if (m_isEngaged)
+ new (NotNull, std::addressof(m_value)) T(std::move(other.m_value));
+ }
+
</ins><span class="cx"> Optional(T&& value)
</span><span class="cx"> : m_isEngaged(true)
</span><span class="cx"> , m_value(std::move(value))
</span><span class="lines">@@ -68,7 +83,6 @@
</span><span class="cx"> : m_isEngaged(true)
</span><span class="cx"> , m_value(std::forward<Args>(args)...)
</span><span class="cx"> {
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ~Optional()
</span><span class="lines">@@ -77,6 +91,53 @@
</span><span class="cx"> m_value.~T();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ Optional& operator=(const Optional& other)
+ {
+ if (m_isEngaged == other.m_isEngaged) {
+ if (m_isEngaged)
+ m_value = other.m_value;
+ return *this;
+ }
+
+ if (m_isEngaged)
+ m_value.~T();
+ else
+ new (NotNull, std::addressof(m_value)) T(other.m_value);
+ m_isEngaged = other.m_isEngaged;
+
+ return *this;
+ }
+
+ Optional& operator=(Optional&& other)
+ {
+ if (m_isEngaged == other.m_isEngaged) {
+ if (m_isEngaged)
+ m_value = std::move(other.m_value);
+ return *this;
+ }
+
+ if (m_isEngaged)
+ m_value.~T();
+ else
+ new (NotNull, std::addressof(m_value)) T(std::move(other.m_value));
+ m_isEngaged = other.m_isEngaged;
+
+ return *this;
+ }
+
+ template<typename U>
+ Optional& operator=(U&& u)
+ {
+ if (m_isEngaged) {
+ m_value = std::forward<U>(u);
+ return *this;
+ }
+
+ new (NotNull, std::addressof(m_value)) T(std::forward<U>(u));
+ m_isEngaged = true;
+ return *this;
+ }
+
</ins><span class="cx"> explicit operator bool() const { return m_isEngaged; }
</span><span class="cx">
</span><span class="cx"> T& value()
</span></span></pre>
</div>
</div>
</body>
</html>