This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 7c994460094ca689db33640a0396df9921d346a3 Author: Pedro Giffuni <p...@apache.org> AuthorDate: 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 git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1829494 13f79535-47bb-0310-9956-ffa450edef68 --- main/basegfx/source/range/b2drangeclipper.cxx | 7 ++++++- main/slideshow/source/inc/listenercontainer.hxx | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/main/basegfx/source/range/b2drangeclipper.cxx b/main/basegfx/source/range/b2drangeclipper.cxx index 0b64352..cdab9ee 100644 --- a/main/basegfx/source/range/b2drangeclipper.cxx +++ b/main/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/main/slideshow/source/inc/listenercontainer.hxx b/main/slideshow/source/inc/listenercontainer.hxx index 7dba512..0d6057b 100644 --- a/main/slideshow/source/inc/listenercontainer.hxx +++ b/main/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>