[Libreoffice-commits] core.git: sw/inc

[Bjoern Michaelsen]

 sw/inc/ring.hxx |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

New commits:
commit 1d2ba2e7facbe074a4450dd7ead0612f36c10b47
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Dec 5 21:57:39 2014 +0100

    this seems to be working too and is less ugly
    
    Change-Id: I335572eee5e898b55423f6fbabd519e287933fa1

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 9c6efa9..9c49946 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;