diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-05 21:57:39 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-12-05 22:00:22 +0100 |
| commit | 1d2ba2e7facbe074a4450dd7ead0612f36c10b47 (patch) | |
| tree | 146f5c2ca81ac6ead89b3f93607a59fc3aed23b3 /sw/inc/ring.hxx | |
| parent | 9a568c41ccd1ccf6073758973da5914a44f629d2 (diff) | |
this seems to be working too and is less ugly
Change-Id: I335572eee5e898b55423f6fbabd519e287933fa1
Diffstat (limited to 'sw/inc/ring.hxx')
| -rw-r--r-- | sw/inc/ring.hxx | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx index 9c6efa926f8e..9c499460721c 100644 --- a/sw/inc/ring.hxx +++ b/sw/inc/ring.hxx @@ -27,13 +27,6 @@ #include <boost/iterator/iterator_facade.hpp> #include <boost/intrusive/circular_list_algorithms.hpp> -#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; -class _SaveMergeRedlines; -#endif - namespace sw { template <typename value_type> class RingContainer; @@ -110,12 +103,7 @@ namespace sw }; #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>; - friend class sw::RingContainer<SwViewShell>; - friend class sw::RingContainer<const SwViewShell>; - friend class sw::RingContainer<_SaveMergeRedlines>; - friend class sw::RingContainer<const _SaveMergeRedlines>; + template<typename gcc_hack_value> friend class sw::RingContainer; #else friend ring_container; friend const_ring_container; |