Attachment 153611 Details for Bug 198091 – Use swap member function instead of free swap function, to appease clang 3.6.0

[patch] Use swap member function instead of free swap function, to appease clang 3.6.0

devel__google-sparsehash-fix-free-swap-1.diff (text/plain), 1.12 KB, created by Dimitry Andric on 2015-02-28 12:39:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2015-02-28 12:39:22 UTC

Size: 1.12 KB

patch

obsolete

>Index: devel/google-sparsehash/files/patch-src__hashtable_test.cc
>===================================================================
>--- devel/google-sparsehash/files/patch-src__hashtable_test.cc	(revision 0)
>+++ devel/google-sparsehash/files/patch-src__hashtable_test.cc	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/hashtable_test.cc.orig	2012-02-22 21:49:42.000000000 +0100
>++++ src/hashtable_test.cc	2015-02-28 13:31:07.532995000 +0100
>+@@ -898,7 +898,7 @@
>+   // Now swap back, using the free-function swap
>+   // NOTE: MSVC seems to have trouble with this free swap, not quite
>+   // sure why.  I've given up trying to fix it though.
>+-#ifdef _MSC_VER
>++#if defined(_MSC_VER) || defined(__clang__)
>+   other_ht.swap(this->ht_);
>+ #else
>+   swap(this->ht_, other_ht);
>
>Property changes on: devel/google-sparsehash/files/patch-src__hashtable_test.cc
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 198091: 153611