30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
|
From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jiri Slaby <jslaby@suse.cz>
|
||
|
|
Date: Tue, 4 May 2021 09:25:03 +0200
|
||
|
|
Subject: [PATCH] add boost tuple include to fix build
|
||
|
|
|
||
|
|
With boost 1.76, we see:
|
||
|
|
lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type
|
||
|
|
70 | boost::math::tuple<double, double, double> operator()(double const& z) const {
|
||
|
|
| ^~~~~
|
||
|
|
|
||
|
|
Fix this by including the proper boost header.
|
||
|
|
---
|
||
|
|
librecad/src/lib/engine/rs_ellipse.cpp | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp
|
||
|
|
index 291f734ea6..d47bf6ca4a 100644
|
||
|
|
--- a/librecad/src/lib/engine/rs_ellipse.cpp
|
||
|
|
+++ b/librecad/src/lib/engine/rs_ellipse.cpp
|
||
|
|
@@ -48,6 +48,9 @@
|
||
|
|
#include <boost/version.hpp>
|
||
|
|
#include <boost/math/tools/roots.hpp>
|
||
|
|
#include <boost/math/special_functions/ellint_2.hpp>
|
||
|
|
+#if BOOST_VERSION > 104500
|
||
|
|
+#include <boost/math/tools/tuple.hpp>
|
||
|
|
+#endif
|
||
|
|
#endif
|
||
|
|
|
||
|
|
namespace{
|