sw/inc/ring.hxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 80a1b88e0441463f7c9cb3541441e655210ee44f
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Fri Dec 5 20:51:54 2014 +0100
also dont confuse clang on OSX
Change-Id: I4d80adbd284b7ed8193fa79e4d4abdec3ba60cb2
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index b751733..9c6efa9 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -27,7 +27,7 @@
#include <boost/iterator/iterator_facade.hpp>
#include <boost/intrusive/circular_list_algorithms.hpp>
-#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 7)
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4) &&
(__GNUC_MINOR__ < 7)
// gcc 4.6 backwards compat hack, remove ASAP when we drop support
class SwPaM;
class SwViewShell;
@@ -108,7 +108,7 @@ namespace sw
static node_ptr get_previous(const_node_ptr n) { return
const_cast<node_ptr>(static_cast<const_node_ptr>(n))->GetPrevInRing(); };
static void set_previous(node_ptr n, node_ptr previous) {
n->pPrev = previous; };
};
-#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 7)
+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4) &&
(__GNUC_MINOR__ < 7)
// gcc 4.6 backwards compat hack, remove ASAP when we drop support
friend class sw::RingContainer<SwPaM>;
friend class sw::RingContainer<const SwPaM>;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
