diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-08 18:18:06 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-08 18:19:23 +0100 |
| commit | bf4eca5b90e915a7273fe9f746187740683ceabe (patch) | |
| tree | 8a182182002df3c42bf85fcddbbbfa8ed60dfb24 /sw/inc | |
| parent | ed759f9cc5ba0e49a122ce396e013a47554bf89f (diff) | |
trying to make this fit in gcc-4.6s little brain
Change-Id: I0c247a0f316b6700017ae0668b41497811924577
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/ring.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx index 59c39814d9b3..d1e46a6ba9df 100644 --- a/sw/inc/ring.hxx +++ b/sw/inc/ring.hxx @@ -105,14 +105,15 @@ namespace sw #if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 7) // gcc 4.6 backwards compat hack, remove ASAP when we drop support template<typename gcc_hack_value> friend class sw::RingContainer; + template<typename gcc_hack_value> friend class sw::RingIterator; #else friend ring_container; friend const_ring_container; -#endif friend typename ring_container::iterator; friend typename ring_container::const_iterator; friend typename const_ring_container::iterator; friend typename const_ring_container::const_iterator; +#endif friend class boost::iterator_core_access; typedef boost::intrusive::circular_list_algorithms<Ring_node_traits> algo; value_type* pNext; |