diff options
| author | vd <vd@FreeBSD.org> | 2015-03-04 16:43:45 +0800 |
|---|---|---|
| committer | vd <vd@FreeBSD.org> | 2015-03-04 16:43:45 +0800 |
| commit | bda4bef0c687fa74a0edee174a88df0cdb977e31 (patch) | |
| tree | be397339ed063dd98e9d495839d9c8416c9e5763 | |
| parent | 24b3c3bfe599580cb78ff3227f93a45940a71313 (diff) | |
| download | freebsd-ports-graphics-bda4bef0c687fa74a0edee174a88df0cdb977e31.tar.gz freebsd-ports-graphics-bda4bef0c687fa74a0edee174a88df0cdb977e31.tar.zst freebsd-ports-graphics-bda4bef0c687fa74a0edee174a88df0cdb977e31.zip | |
Fix compilation of devel/google-sparsehash with clang 3.6.0
PR: 198091
Submitted by: Dimitry Andric
| -rw-r--r-- | devel/google-sparsehash/files/patch-src__hashtable_test.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/devel/google-sparsehash/files/patch-src__hashtable_test.cc b/devel/google-sparsehash/files/patch-src__hashtable_test.cc new file mode 100644 index 00000000000..0fd5ffd04cb --- /dev/null +++ b/devel/google-sparsehash/files/patch-src__hashtable_test.cc @@ -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); |