Revision: 140743 https://trac.macports.org/changeset/140743 Author: mcalhoun@macports.org Date: 2015-10-01 16:57:02 -0700 (Thu, 01 Oct 2015) Log Message: ----------- sparsehash: upstream patch to find swap; attempt to fix #48556; no rev. bump required since port build correctly or not at all Modified Paths: -------------- trunk/dports/devel/sparsehash/Portfile Added Paths: ----------- trunk/dports/devel/sparsehash/files/patch-hashtable_test.cc.diff Modified: trunk/dports/devel/sparsehash/Portfile =================================================================== --- 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) @@ -27,4 +27,8 @@ sha256 2ed639a7155607c097c2029af5f4287296595080b2e5dd2e2ebd9bbb7450b87c # see https://code.google.com/p/sparsehash/issues/detail?id=100 patchfiles allocator.patch +# see +# https://github.com/sparsehash/sparsehash/issues/111 +# https://github.com/sparsehash/sparsehash/commit/7f6351fb06241b96fdb39ae3aff5... +patchfiles-append patch-hashtable_test.cc.diff patch.pre_args -p1 Added: trunk/dports/devel/sparsehash/files/patch-hashtable_test.cc.diff =================================================================== --- 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) @@ -0,0 +1,22 @@ +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());