Fix build warnings from deprecated Boost headers (1.74)

FreeCAD · Jan 2, 2021 · ea6e8e9 · ea6e8e9
1 parent e6032b7
commit ea6e8e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp
@@ -35,7 +35,7 @@
 #   include "boost_fix/intrusive/detail/memory_util.hpp"
 #   include "boost_fix/container/detail/memory_util.hpp"
 # endif
-# include <boost/geometry.hpp>
+# include <boost_geometry.hpp>
 # include <boost/geometry/index/rtree.hpp>
 # include <boost/geometry/geometries/geometries.hpp>
 # include <boost/geometry/geometries/register/point.hpp>

diff --git a/src/boost_geometry.hpp b/src/boost_geometry.hpp
@@ -0,0 +1,9 @@
+#ifndef FREECAD_GEOMETRY_HPP_WORKAROUND
+#define FREECAD_GEOMETRY_HPP_WORKAROUND
+
+// Workaround for boost >= 1.74
+#define BOOST_ALLOW_DEPRECATED_HEADERS
+#include <boost/geometry.hpp>
+#undef BOOST_ALLOW_DEPRECATED_HEADERS
+
+#endif // #ifndef FREECAD_GEOMETRY_HPP_WORKAROUND