[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/source slideshow/source

[Pedro Giffuni]

 basegfx/source/range/b2drangeclipper.cxx   |    7 ++++++-
 slideshow/source/inc/listenercontainer.hxx |    7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit db5d4aa8de3d380c560636b9ac82a1213d42d309
Author: Pedro Giffuni <pfg at apache.org>
Date:   Thu Apr 19 03:43:05 2018 +0000

    Fix build with boost-1.67.
    
    The release notes say:
    ____
    Utility:
    Breaking change: <boost/utility.hpp> header no longer includes boost::next
    and boost::prior as they have been moved to the iterator module. Instead
    include <boost/next_prior.hpp>. Other uses of <boost/utility.hpp> are
    discouraged, it's better to use the header for the specific functionality
    instead.
    
    ____
    
    Obtained from:  Jan Beich
    FreeBSD PR:     227553

diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx
index 3563bbc5ef7f..2ca80a760412 100644
--- a/basegfx/source/range/b2drangeclipper.cxx
+++ b/basegfx/source/range/b2drangeclipper.cxx
@@ -35,7 +35,12 @@
 
 #include <o3tl/vector_pool.hxx>
 #include <boost/bind.hpp>
-#include <boost/utility.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106700
+# include <boost/utility.hpp>
+#else
+# include <boost/next_prior.hpp>
+#endif
 
 #include <algorithm>
 #include <deque>
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx
index bd1f9e384904..94bf77ab61d2 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -24,7 +24,12 @@
 #define INCLUDED_SLIDESHOW_LISTENERCONTAINER_HXX
 
 #include <osl/mutex.hxx>
-#include <boost/utility.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106700
+# include <boost/utility.hpp>
+#else
+# include <boost/next_prior.hpp>
+#endif
 #include <algorithm>
 #include <vector>