diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-26 17:28:43 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-26 17:31:14 +0200 |
| commit | 3a68a7dcf49f7be95086b747c8426aa310307e49 (patch) | |
| tree | 5c5ded4a7b69d4eaff886e7ee35caebf275eb738 /sw/inc/ring.hxx | |
| parent | b15019d84f52f546294c0336382ea6217f833ed2 (diff) | |
Remove workarounds for no longer supported GCC 4.6
In bridges/source/cpp_uno/gcc3_macosx_x86-64/share.hxx, the #if also covered
Clang, which actually needs these declarations (for now; the right fix will
probably be to #include <cxxabi.h>).
Change-Id: I1eebd59e2371f3498d740ab78244927358c4f23f
Diffstat (limited to 'sw/inc/ring.hxx')
| -rw-r--r-- | sw/inc/ring.hxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx index f6aac23eda4a..61423d0223a6 100644 --- a/sw/inc/ring.hxx +++ b/sw/inc/ring.hxx @@ -109,18 +109,12 @@ namespace sw static node_ptr get_previous(const_node_ptr n) { return const_cast<node_ptr>(n)->pPrev; }; static void set_previous(node_ptr n, node_ptr previous) { n->pPrev = previous; }; }; -#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; 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; Ring* pNext; |