diff --git a/src/App/Document.cpp b/src/App/Document.cpp index e985aa1b47..73610f58b6 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -70,7 +70,7 @@ recompute path. Also, it enables more complicated dependencies beyond trees. #include -#include +#include #include #include #include diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h index 634cfe55a4..115e397830 100644 --- a/src/App/PreCompiled.h +++ b/src/App/PreCompiled.h @@ -86,7 +86,7 @@ #include #include -#include +#include #include //namespace po = boost::program_options; diff --git a/src/App/PropertyExpressionEngine.cpp b/src/App/PropertyExpressionEngine.cpp index b380624599..3801f475b8 100644 --- a/src/App/PropertyExpressionEngine.cpp +++ b/src/App/PropertyExpressionEngine.cpp @@ -36,7 +36,6 @@ #include #include #include -#include using namespace App; diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h index 4b63a8b147..1b343628ea 100644 --- a/src/App/PropertyExpressionEngine.h +++ b/src/App/PropertyExpressionEngine.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 96efd9dab2..d299c0a14a 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -24,7 +24,7 @@ #ifndef _PreComp_ #include #include -#include +#include #include #include diff --git a/src/Gui/DAGView/DAGModelGraph.h b/src/Gui/DAGView/DAGModelGraph.h index cd48bff21e..ca5c264155 100644 --- a/src/Gui/DAGView/DAGModelGraph.h +++ b/src/Gui/DAGView/DAGModelGraph.h @@ -26,9 +26,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index 4aef35543a..23d89e9e5d 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -84,7 +84,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index a7cc360af3..80a5cf2aa5 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -81,7 +81,7 @@ #include #include -#include +#include #include //namespace po = boost::program_options; diff --git a/src/Mod/Sketcher/App/planegcs/GCS.cpp b/src/Mod/Sketcher/App/planegcs/GCS.cpp index abccb0b9a0..16d7974eda 100644 --- a/src/Mod/Sketcher/App/planegcs/GCS.cpp +++ b/src/Mod/Sketcher/App/planegcs/GCS.cpp @@ -98,7 +98,7 @@ #include #include -#include +#include #include typedef Eigen::FullPivHouseholderQR::IntDiagSizeVectorType MatrixIndexType; diff --git a/src/Mod/TechDraw/App/EdgeWalker.h b/src/Mod/TechDraw/App/EdgeWalker.h index 3fa02b6f2e..4dcc5b502c 100644 --- a/src/Mod/TechDraw/App/EdgeWalker.h +++ b/src/Mod/TechDraw/App/EdgeWalker.h @@ -29,7 +29,7 @@ #define TECHDRAW_EDGEWALKER_H #include -#include +#include #include #include #include diff --git a/src/boost_graph_adjacency_list.hpp b/src/boost_graph_adjacency_list.hpp new file mode 100644 index 0000000000..313a38ca60 --- /dev/null +++ b/src/boost_graph_adjacency_list.hpp @@ -0,0 +1,9 @@ +#ifndef FREECAD_ADJACENCY_LIST_HPP_WORKAROUND +#define FREECAD_ADJACENCY_LIST_HPP_WORKAROUND + +// Workaround for boost >= 1.75 +#define BOOST_ALLOW_DEPRECATED_HEADERS +#include +#undef BOOST_ALLOW_DEPRECATED_HEADERS + +#endif // #ifndef FREECAD_ADJACENCY_LIST_HPP_WORKAROUND diff --git a/src/boost_graph_reverse_graph.hpp b/src/boost_graph_reverse_graph.hpp new file mode 100644 index 0000000000..6a0cf88d74 --- /dev/null +++ b/src/boost_graph_reverse_graph.hpp @@ -0,0 +1,9 @@ +#ifndef FREECAD_REVERSE_GRAPH_HPP_WORKAROUND +#define FREECAD_REVERSE_GRAPH_HPP_WORKAROUND + +// Workaround for boost >= 1.75 +#define BOOST_ALLOW_DEPRECATED_HEADERS +#include +#undef BOOST_ALLOW_DEPRECATED_HEADERS + +#endif // #ifndef FREECAD_REVERSE_GRAPH_HPP_WORKAROUND