diff options
| author | dholland <dholland> | 2014-12-27 02:46:40 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2014-12-27 02:46:40 +0000 |
| commit | 40a641a5483e1081833b6963ccc54a93935c7053 (patch) | |
| tree | 047f408a2fc6dbcdca16fdeab5c41c825199b7aa /graphics/hugin/patches | |
| parent | 4a79bc74f51ff86434691cb5a0b2f346b942d587 (diff) | |
| download | pkgsrc-40a641a5483e1081833b6963ccc54a93935c7053.tar.gz | |
Adjust one of Joerg's clang patches so it still works on gcc.
This would be much easier if clang didn't lie about itself being gcc.
Diffstat (limited to 'graphics/hugin/patches')
| -rw-r--r-- | graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx b/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx index 89fc74730c8..5e0f3b46cce 100644 --- a/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx +++ b/graphics/hugin/patches/patch-src_foreign_vigra_vigra_cachedfileimage.hxx @@ -1,16 +1,17 @@ -$NetBSD: patch-src_foreign_vigra_vigra_cachedfileimage.hxx,v 1.1 2013/06/27 15:51:49 joerg Exp $ +$NetBSD: patch-src_foreign_vigra_vigra_cachedfileimage.hxx,v 1.2 2014/12/27 02:46:41 dholland Exp $ --- src/foreign/vigra/vigra/cachedfileimage.hxx.orig 2013-06-25 21:58:48.000000000 +0000 +++ src/foreign/vigra/vigra/cachedfileimage.hxx -@@ -554,11 +554,7 @@ class NotifyingDirectionSelector; +@@ -554,11 +554,11 @@ class NotifyingDirectionSelector; template <class T, class Notify> class NotifyingDirectionSelector<UnstridedArrayTag, T, Notify> { -#ifdef __GNUC__ --friend class Notify::self_type; --#else ++#if defined(__GNUC__) && !defined(__clang__) + friend class Notify::self_type; + #else friend typename Notify::self_type; --#endif + #endif protected: NotifyingDirectionSelector(T base = 0) : current_(base), notify_(NULL) {} NotifyingDirectionSelector(NotifyingDirectionSelector const & rhs) : current_(rhs.current_), notify_(NULL) {} |