Skip to content

C
core
Kaydet (Commit) 1d2ba2e7 authored tarafından Bjoern Michaelsen's avatar Bjoern Michaelsen
Dosyalara gözat
Seçenekler

this seems to be working too and is less ugly 

Change-Id: I335572eee5e898b55423f6fbabd519e287933fa1
üst 9a568c41
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 13 deletions
sw/inc/ring.hxx
Dosyayı görüntüle @ 1d2ba2e7
...@@ -27,13 +27,6 @@ ...@@ -27,13 +27,6 @@
#include <boost/iterator/iterator_facade.hpp> #include <boost/iterator/iterator_facade.hpp>
#include <boost/intrusive/circular_list_algorithms.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 namespace sw
{ {
template <typename value_type> class RingContainer; template <typename value_type> class RingContainer;
...@@ -110,12 +103,7 @@ namespace sw ...@@ -110,12 +103,7 @@ namespace sw
}; };
#if !defined(__clang__) && 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 // gcc 4.6 backwards compat hack, remove ASAP when we drop support
friend class sw::RingContainer<SwPaM>; template<typename gcc_hack_value> friend class sw::RingContainer;
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>;
#else #else
friend ring_container; friend ring_container;
friend const_ring_container; friend const_ring_container;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment