svn commit: r380423 - head/devel/google-sparsehash/files

Vasil Dimov vd at FreeBSD.org
Wed Mar 4 08:43:46 UTC 2015


Author: vd
Date: Wed Mar  4 08:43:45 2015
New Revision: 380423
URL: https://svnweb.freebsd.org/changeset/ports/380423
QAT: https://qat.redports.org/buildarchive/r380423/

Log:
  Fix compilation of devel/google-sparsehash with clang 3.6.0
  
  PR:		198091
  Submitted by:	 Dimitry Andric

Added:
  head/devel/google-sparsehash/files/patch-src__hashtable_test.cc   (contents, props changed)

Added: head/devel/google-sparsehash/files/patch-src__hashtable_test.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/google-sparsehash/files/patch-src__hashtable_test.cc	Wed Mar  4 08:43:45 2015	(r380423)
@@ -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__) && __clang_major__ >= 3 && __clang_minor__ >= 6)
+   other_ht.swap(this->ht_);
+ #else
+   swap(this->ht_, other_ht);


More information about the svn-ports-head mailing list