[Libreoffice-commits] core.git: tools/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sat Dec 8 12:56:24 UTC 2018
tools/source/generic/fract.cxx | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 045f141bfcac40388d04e7ad831f57178d04e080
Author: Rene Engelhard <rene at debian.org>
AuthorDate: Sat Dec 8 13:49:52 2018 +0100
Commit: Rene Engelhard <rene at debian.org>
CommitDate: Sat Dec 8 13:49:52 2018 +0100
don't use deprecated boost/math/common_factor_rt.hpp
In file included from /data/rene/git/LibreOffice/master/tools/source/generic/fract.cxx:33:
/usr/include/boost/math/common_factor_rt.hpp:13:63: note: #pragma message: This header is deprecated. Use <boost/integer/common_factor_rt.hpp> instead.
BOOST_HEADER_DEPRECATED("<boost/integer/common_factor_rt.hpp>");
the BOOST_HEADER_DEPRECATED(..) was done in boost 1.67 so make it conditional
on that one.
Change-Id: I10cb0e4c25e1fa1497dea35c0fc3e5e719142123
diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index d50cffc990aa..b9334941bc89 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -30,7 +30,11 @@
#include <algorithm>
#include <cmath>
+#if BOOST_VERSION >= 106700
+#include <boost/integer/common_factor_rt.hpp>
+#else
#include <boost/math/common_factor_rt.hpp>
+#endif
#include <boost/rational.hpp>
static boost::rational<sal_Int32> rational_FromDouble(double dVal);
More information about the Libreoffice-commits
mailing list