Boost: [skip ci] Fix build warnings from deprecated Boost headers (v1.75)

This commit is contained in:
wmayer
2020-12-29 15:34:25 +01:00
parent ed3acd466d
commit 0f31c87cc9
12 changed files with 28 additions and 11 deletions

View File

@@ -70,7 +70,7 @@ recompute path. Also, it enables more complicated dependencies beyond trees.
#include <boost/algorithm/string.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/graph/subgraph.hpp>
#include <boost/graph/graphviz.hpp>
#include <boost/graph/strong_components.hpp>

View File

@@ -86,7 +86,7 @@
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/program_options.hpp>
//namespace po = boost::program_options;

View File

@@ -36,7 +36,6 @@
#include <CXX/Objects.hxx>
#include <boost/bind/bind.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/graph/adjacency_list.hpp>
using namespace App;

View File

@@ -26,7 +26,7 @@
#include <boost/unordered/unordered_map.hpp>
#include <boost/function.hpp>
#include <boost_signals2.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/graph/topological_sort.hpp>
#include <App/PropertyLinks.h>
#include <App/Expression.h>

View File

@@ -24,7 +24,7 @@
#ifndef _PreComp_
#include <boost_bind_bind.hpp>
#include <boost/graph/topological_sort.hpp>
#include <boost/graph/reverse_graph.hpp>
#include <boost_graph_reverse_graph.hpp>
#include <QApplication>
#include <QString>

View File

@@ -26,9 +26,9 @@
#include <memory>
#include <bitset>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/graph/iteration_macros.hpp>
#include <boost/graph/reverse_graph.hpp>
#include <boost_graph_reverse_graph.hpp>
#include <boost/graph/topological_sort.hpp>
#include <boost/graph/graphviz.hpp>
#include <boost/graph/breadth_first_search.hpp>

View File

@@ -84,7 +84,7 @@
#include <boost/program_options.hpp>
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/exception.hpp>

View File

@@ -81,7 +81,7 @@
#include <boost/tuple/tuple.hpp>
#include <boost/utility.hpp>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/program_options.hpp>
//namespace po = boost::program_options;

View File

@@ -98,7 +98,7 @@
#include <FCConfig.h>
#include <Base/Console.h>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/graph/connected_components.hpp>
typedef Eigen::FullPivHouseholderQR<Eigen::MatrixXd>::IntDiagSizeVectorType MatrixIndexType;

View File

@@ -29,7 +29,7 @@
#define TECHDRAW_EDGEWALKER_H
#include <vector>
#include <boost/graph/adjacency_list.hpp>
#include <boost_graph_adjacency_list.hpp>
#include <boost/graph/properties.hpp>
#include <boost/graph/graph_traits.hpp>
#include <boost/property_map/property_map.hpp>

View File

@@ -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 <boost/graph/adjacency_list.hpp>
#undef BOOST_ALLOW_DEPRECATED_HEADERS
#endif // #ifndef FREECAD_ADJACENCY_LIST_HPP_WORKAROUND

View File

@@ -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 <boost/graph/reverse_graph.hpp>
#undef BOOST_ALLOW_DEPRECATED_HEADERS
#endif // #ifndef FREECAD_REVERSE_GRAPH_HPP_WORKAROUND