From 8fa5c0315046e741d301ed236c946c55693d1eee Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Fri, 7 Dec 2018 11:46:25 +0100
Subject: HAVE_BROKEN_CONST_ITERATORS is always false now

...but for safety, leave the configure.ac check in for some longer.

Change-Id: Ife94cdfd56696edb113e32d84f563dd805e757e5
Reviewed-on: https://gerrit.libreoffice.org/64769
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
---
 sdext/source/pdfimport/tree/drawtreevisiting.cxx   | 8 --------
 sdext/source/pdfimport/tree/writertreevisiting.cxx | 8 --------
 2 files changed, 16 deletions(-)

(limited to 'sdext')

diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.cxx b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
index 8182d5fd47eb..b50a80a2ff48 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.cxx
@@ -28,7 +28,6 @@
 
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <config_global.h>
 #include <osl/diagnose.h>
 #include <com/sun/star/i18n/BreakIterator.hpp>
 #include <com/sun/star/i18n/CharacterClassification.hpp>
@@ -449,14 +448,7 @@ void DrawXmlOptimizer::visit( PolyPolyElement& elem, const std::list< std::uniqu
         elem.Action |= pNext->Action;
 
         elem.Children.splice( elem.Children.end(), pNext->Children );
-        // workaround older compilers that do not have std::list::erase(const_iterator)
-#if HAVE_BROKEN_CONST_ITERATORS
-        auto tmpIt = elem.Parent->Children.begin();
-        std::advance(tmpIt, std::distance(elem.Parent->Children.cbegin(), next_it));
-        elem.Parent->Children.erase(tmpIt);
-#else
         elem.Parent->Children.erase(next_it);
-#endif
     }
 }
 
diff --git a/sdext/source/pdfimport/tree/writertreevisiting.cxx b/sdext/source/pdfimport/tree/writertreevisiting.cxx
index 6e37899fbd55..a16f4b443068 100644
--- a/sdext/source/pdfimport/tree/writertreevisiting.cxx
+++ b/sdext/source/pdfimport/tree/writertreevisiting.cxx
@@ -28,7 +28,6 @@
 
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/range/b2drange.hxx>
-#include <config_global.h>
 #include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
@@ -411,14 +410,7 @@ void WriterXmlOptimizer::visit( PolyPolyElement& elem, const std::list< std::uni
         elem.Action |= pNext->Action;
 
         elem.Children.splice( elem.Children.end(), pNext->Children );
-        // workaround older compilers that do not have std::list::erase(const_iterator)
-#if HAVE_BROKEN_CONST_ITERATORS
-        auto tmpIt = elem.Parent->Children.begin();
-        std::advance(tmpIt, std::distance(elem.Parent->Children.cbegin(), next_it));
-        elem.Parent->Children.erase(tmpIt);
-#else
         elem.Parent->Children.erase(next_it);
-#endif
     }
 }
 
-- 
cgit