<!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>[195629] 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/195629">195629</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-26 15:46:28 -0800 (Tue, 26 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make HashTable iterators STL iterators compatible
https://bugs.webkit.org/show_bug.cgi?id=153512
Patch by Yusuke Suzuki <utatane.tea@gmail.com> on 2016-01-26
Reviewed by Alex Christensen.
While <a href="http://trac.webkit.org/projects/webkit/changeset/178581">r178581</a> makes many hash table iterators STL compatible, still several iterators are not.
This patch fixes that; inheriting std::iterator correctly to meet STL iterator requirements (like iterator_category etc.)
It could recover Windows build failure.
* wtf/HashTable.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashTableh">trunk/Source/WTF/wtf/HashTable.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (195628 => 195629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-01-26 23:22:18 UTC (rev 195628)
+++ trunk/Source/WTF/ChangeLog 2016-01-26 23:46:28 UTC (rev 195629)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-26 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ Make HashTable iterators STL iterators compatible
+ https://bugs.webkit.org/show_bug.cgi?id=153512
+
+ Reviewed by Alex Christensen.
+
+ While r178581 makes many hash table iterators STL compatible, still several iterators are not.
+ This patch fixes that; inheriting std::iterator correctly to meet STL iterator requirements (like iterator_category etc.)
+ It could recover Windows build failure.
+
+ * wtf/HashTable.h:
+
</ins><span class="cx"> 2016-01-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> BlockPtr needs boolean operators
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashTableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashTable.h (195628 => 195629)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashTable.h 2016-01-26 23:22:18 UTC (rev 195628)
+++ trunk/Source/WTF/wtf/HashTable.h 2016-01-26 23:46:28 UTC (rev 195629)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #define WTF_HashTable_h
</span><span class="cx">
</span><span class="cx"> #include <atomic>
</span><ins>+#include <iterator>
</ins><span class="cx"> #include <mutex>
</span><span class="cx"> #include <string.h>
</span><span class="cx"> #include <type_traits>
</span><span class="lines">@@ -103,7 +104,7 @@
</span><span class="cx"> typedef enum { HashItemKnownGood } HashItemKnownGoodTag;
</span><span class="cx">
</span><span class="cx"> template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
</span><del>- class HashTableConstIterator {
</del><ins>+ class HashTableConstIterator : public std::iterator<std::forward_iterator_tag, Value, std::ptrdiff_t, const Value*, const Value&> {
</ins><span class="cx"> private:
</span><span class="cx"> typedef HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits> HashTableType;
</span><span class="cx"> typedef HashTableIterator<Key, Value, Extractor, HashFunctions, Traits, KeyTraits> iterator;
</span><span class="lines">@@ -239,7 +240,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename Key, typename Value, typename Extractor, typename HashFunctions, typename Traits, typename KeyTraits>
</span><del>- class HashTableIterator {
</del><ins>+ class HashTableIterator : public std::iterator<std::forward_iterator_tag, Value, std::ptrdiff_t, Value*, Value&> {
</ins><span class="cx"> private:
</span><span class="cx"> typedef HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits> HashTableType;
</span><span class="cx"> typedef HashTableIterator<Key, Value, Extractor, HashFunctions, Traits, KeyTraits> iterator;
</span><span class="lines">@@ -1425,7 +1426,7 @@
</span><span class="cx">
</span><span class="cx"> // iterator adapters
</span><span class="cx">
</span><del>- template<typename HashTableType, typename ValueType> struct HashTableConstIteratorAdapter {
</del><ins>+ template<typename HashTableType, typename ValueType> struct HashTableConstIteratorAdapter : public std::iterator<std::forward_iterator_tag, ValueType, std::ptrdiff_t, const ValueType*, const ValueType&> {
</ins><span class="cx"> HashTableConstIteratorAdapter() {}
</span><span class="cx"> HashTableConstIteratorAdapter(const typename HashTableType::const_iterator& impl) : m_impl(impl) {}
</span><span class="cx">
</span><span class="lines">@@ -1439,7 +1440,7 @@
</span><span class="cx"> typename HashTableType::const_iterator m_impl;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- template<typename HashTableType, typename ValueType> struct HashTableIteratorAdapter {
</del><ins>+ template<typename HashTableType, typename ValueType> struct HashTableIteratorAdapter : public std::iterator<std::forward_iterator_tag, ValueType, std::ptrdiff_t, ValueType*, ValueType&> {
</ins><span class="cx"> HashTableIteratorAdapter() {}
</span><span class="cx"> HashTableIteratorAdapter(const typename HashTableType::iterator& impl) : m_impl(impl) {}
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>