diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-05 20:51:54 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-05 20:51:54 +0100 |
| commit | 80a1b88e0441463f7c9cb3541441e655210ee44f (patch) | |
| tree | 684879d9a2ff25b3e66c5cd255bb8afbe0c5667c /sw/inc/ring.hxx | |
| parent | 526e746c3a95ee1dfbdf222e61d28ccc5be3cc98 (diff) | |
also dont confuse clang on OSX
Change-Id: I4d80adbd284b7ed8193fa79e4d4abdec3ba60cb2
Diffstat (limited to 'sw/inc/ring.hxx')
| -rw-r--r-- | sw/inc/ring.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx index b75173374a73..9c6efa926f8e 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>; |