<!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>[140743] trunk/dports/devel/sparsehash</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="https://trac.macports.org/changeset/140743">140743</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2015-10-01 16:57:02 -0700 (Thu, 01 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>sparsehash: upstream patch to find swap; attempt to fix #48556; no rev. bump required since port build correctly or not at all</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelsparsehashPortfile">trunk/dports/devel/sparsehash/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelsparsehashfilespatchhashtable_testccdiff">trunk/dports/devel/sparsehash/files/patch-hashtable_test.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelsparsehashPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/sparsehash/Portfile (140742 => 140743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/sparsehash/Portfile 2015-10-01 22:52:14 UTC (rev 140742)
+++ trunk/dports/devel/sparsehash/Portfile 2015-10-01 23:57:02 UTC (rev 140743)
</span><span class="lines">@@ -27,4 +27,8 @@
</span><span class="cx"> sha256 2ed639a7155607c097c2029af5f4287296595080b2e5dd2e2ebd9bbb7450b87c
</span><span class="cx"> # see https://code.google.com/p/sparsehash/issues/detail?id=100
</span><span class="cx"> patchfiles allocator.patch
</span><ins>+# see
+# https://github.com/sparsehash/sparsehash/issues/111
+# https://github.com/sparsehash/sparsehash/commit/7f6351fb06241b96fdb39ae3aff53c2acb1cd7a4
+patchfiles-append patch-hashtable_test.cc.diff
</ins><span class="cx"> patch.pre_args -p1
</span></span></pre></div>
<a id="trunkdportsdevelsparsehashfilespatchhashtable_testccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/sparsehash/files/patch-hashtable_test.cc.diff (0 => 140743)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/sparsehash/files/patch-hashtable_test.cc.diff (rev 0)
+++ trunk/dports/devel/sparsehash/files/patch-hashtable_test.cc.diff 2015-10-01 23:57:02 UTC (rev 140743)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+From 7f6351fb06241b96fdb39ae3aff53c2acb1cd7a4 Mon Sep 17 00:00:00 2001
+From: Donovan Hide <donovanhide@gmail.com>
+Date: Wed, 23 Sep 2015 17:46:42 +0100
+Subject: [PATCH] use std::swap in hashtable test
+
+---
+ src/hashtable_test.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/hashtable_test.cc b/src/hashtable_test.cc
+index 21c60a7..ede7c65 100644
+--- a/src/hashtable_test.cc
++++ b/src/hashtable_test.cc
+@@ -901,5 +901,5 @@ TYPED_TEST(HashtableAllTest, Swap) {
+ #ifdef _MSC_VER
+ other_ht.swap(this->ht_);
+ #else
+- swap(this->ht_, other_ht);
++ std::swap(this->ht_, other_ht);
+ #endif
+
+ EXPECT_EQ(this->UniqueKey(1), this->ht_.deleted_key());
</ins></span></pre>
</div>
</div>
</body>
</html>