You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pf...@apache.org on 2018/04/19 03:43:06 UTC
svn commit: r1829494 - in /openoffice/trunk/main:
basegfx/source/range/b2drangeclipper.cxx
slideshow/source/inc/listenercontainer.hxx
Author: pfg
Date: Thu Apr 19 03:43:05 2018
New Revision: 1829494
URL: http://svn.apache.org/viewvc?rev=1829494&view=rev
Log:
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
Modified:
openoffice/trunk/main/basegfx/source/range/b2drangeclipper.cxx
openoffice/trunk/main/slideshow/source/inc/listenercontainer.hxx
Modified: openoffice/trunk/main/basegfx/source/range/b2drangeclipper.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basegfx/source/range/b2drangeclipper.cxx?rev=1829494&r1=1829493&r2=1829494&view=diff
==============================================================================
--- openoffice/trunk/main/basegfx/source/range/b2drangeclipper.cxx (original)
+++ openoffice/trunk/main/basegfx/source/range/b2drangeclipper.cxx Thu Apr 19 03:43:05 2018
@@ -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>
Modified: openoffice/trunk/main/slideshow/source/inc/listenercontainer.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/source/inc/listenercontainer.hxx?rev=1829494&r1=1829493&r2=1829494&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/source/inc/listenercontainer.hxx (original)
+++ openoffice/trunk/main/slideshow/source/inc/listenercontainer.hxx Thu Apr 19 03:43:05 2018
@@ -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>
Re: svn commit: r1829494 - in /openoffice/trunk/main:
basegfx/source/range/b2drangeclipper.cxx
slideshow/source/inc/listenercontainer.hxx
Posted by Don Lewis <tr...@apache.org>.
On 19 Apr, pfg@apache.org wrote:
> Author: pfg
> Date: Thu Apr 19 03:43:05 2018
> New Revision: 1829494
>
> URL: http://svn.apache.org/viewvc?rev=1829494&view=rev
> Log:
> 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
Actually, I authored that patch. I hadn't yet upstreamed it since I'd
only build tested it with the FreeBSD system boost, versions 1.66 and
1.67. I haven't yet had a chance to do a test build with our old
bundled boost on any platform. It should work, but ...
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org