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

[Bjoern Michaelsen]

 sw/inc/ring.hxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit d13501f194b3a8095e283e0a3d65d1db02e70dad
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 8 18:20:51 2014 +0100

    typo
    
    Change-Id: I5f6b2136f4eb5cdb4825a3df3fc7d2015d8a3d85

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index d1e46a6..e4c62f5 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -180,7 +180,7 @@ namespace sw
             /**
              * Merges two ring containers. All item from both ring containers will
              * be in the same ring container in the end.
-             * Note: value_typehe items of this ring container will be inserted just before
+             * Note: The items of this ring container will be inserted just before
              * item pDestRing
              * @param pDestRing the container to merge this container with
              */
@@ -227,7 +227,7 @@ namespace sw
             value_type& dereference() const
                 { return m_pCurrent ? *m_pCurrent : * m_pStart; }
             /**
-             * value_typehis is:
+             * value_type is is:
              * - pointing to the current item in the iteration in general
              * - nullptr if on the first item (begin())
              * - m_pStart when beyond the last item (end())
commit bf4eca5b90e915a7273fe9f746187740683ceabe
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Dec 8 18:18:06 2014 +0100

    trying to make this fit in gcc-4.6s little brain
    
    Change-Id: I0c247a0f316b6700017ae0668b41497811924577

diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 59c3981..d1e46a6 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;