Fix build warnings from deprecated Boost headers (they are used internally by Boost). Thanks @wwmayer for the hint.

This commit is contained in:
Mateusz Skowroński
2020-12-28 19:15:57 +01:00
committed by wwmayer
parent 4ea97faa5b
commit 2559f2d29c
66 changed files with 82 additions and 64 deletions

View File

@@ -24,7 +24,7 @@
#ifndef APP_APPLICATION_H
#define APP_APPLICATION_H
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <vector>
#include <deque>

View File

@@ -37,7 +37,7 @@
#include <stack>
#include <functional>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace Base {
class Writer;

View File

@@ -36,7 +36,7 @@
#include <unordered_map>
#include <bitset>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace App
{

View File

@@ -25,7 +25,7 @@
#define APP_DOCUMENTOBSERVER_H
#include <Base/BaseClass.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <set>
#include <memory>

View File

@@ -26,7 +26,7 @@
#include <CXX/Objects.hxx>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/bind/bind.hpp>
#include <string>

View File

@@ -24,7 +24,7 @@
#ifndef APP_GROUPEXTENSION_H
#define APP_GROUPEXTENSION_H
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include "FeaturePython.h"
#include "DocumentObject.h"
#include "PropertyLinks.h"

View File

@@ -24,7 +24,7 @@
#define APP_LINK_H
#include <unordered_set>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/preprocessor/facilities/expand.hpp>
#include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/seq/for_each.hpp>

View File

@@ -24,7 +24,7 @@
#ifndef APP_MERGEDOCUMENTS_H
#define APP_MERGEDOCUMENTS_H
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <Base/Persistence.h>
namespace zipios {

View File

@@ -80,7 +80,7 @@
#include <iterator>
// Boost
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/bind/bind.hpp>
#include <boost/regex.hpp>

View File

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

View File

@@ -25,7 +25,7 @@
#define APP_PROPERTYLINKS_H
// Std. configurations
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <vector>
#include <map>

View File

@@ -25,7 +25,7 @@
#include <string>
#include <fstream>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include "DocumentObject.h"
#include "TextDocument.h"

View File

@@ -26,7 +26,7 @@
#include <string>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include "DocumentObject.h"
#include "PropertyStandard.h"

View File

@@ -30,7 +30,7 @@
#include <iostream>
#include <vector>
#include <string>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QString>
#include <QObject>

View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <boost_bind_bind.hpp>
# include <QAbstractItemView>
# include <QActionEvent>

View File

@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include "InventorAll.h"
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <boost_bind_bind.hpp>
# include <sstream>
# include <stdexcept>

View File

@@ -29,7 +29,7 @@
#include <map>
#include <set>
#include <string>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace App {
class Document;

View File

@@ -26,7 +26,7 @@
#include <memory>
#include <vector>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QGraphicsScene>
#include <QBrush>

View File

@@ -35,7 +35,7 @@
#include <boost/multi_index_container.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/multi_index/ordered_index.hpp>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include "DAGRectItem.h"

View File

@@ -25,7 +25,7 @@
#ifndef _PreComp_
# include <algorithm>
# include <boost_bind_bind.hpp>
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <QDockWidget>
#endif

View File

@@ -33,7 +33,7 @@
# include <QTextStream>
# include <qmessagebox.h>
# include <qstatusbar.h>
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <boost_bind_bind.hpp>
# include <Inventor/actions/SoSearchAction.h>
# include <Inventor/nodes/SoSeparator.h>

View File

@@ -26,7 +26,7 @@
#ifndef _PreComp_
# include <QApplication>
# include <algorithm>
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <boost_bind_bind.hpp>
#endif

View File

@@ -25,7 +25,7 @@
#define GUI_DOCUMENTOBSERVER_H
#include <Base/BaseClass.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace App { class Property; }
namespace Gui

View File

@@ -26,7 +26,7 @@
#include <CXX/Objects.hxx>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/bind/bind.hpp>
namespace Gui

View File

@@ -27,7 +27,7 @@
#include <App/ObjectIdentifier.h>
#include <boost/shared_ptr.hpp>
#include <QLabel>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace App {
class Expression;

View File

@@ -26,7 +26,7 @@
#include "MDIView.h"
#include <boost/shared_ptr.hpp>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class QGraphicsScene;

View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <boost_bind_bind.hpp>
# include <qapplication.h>
# include <qregexp.h>

View File

@@ -31,7 +31,7 @@
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/ViewProviderDocumentObject.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class SbVec3f;
class SoPickedPoint;

View File

@@ -24,7 +24,7 @@
#ifndef GUI_MERGEDOCUMENTS_H
#define GUI_MERGEDOCUMENTS_H
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <Base/Persistence.h>
namespace zipios {

View File

@@ -29,7 +29,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Base/Placement.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class QSignalMapper;

View File

@@ -79,7 +79,7 @@
#include <unordered_map>
// Boost
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/bind/bind.hpp>
#include <boost/program_options.hpp>
#include <boost/tuple/tuple.hpp>

View File

@@ -28,7 +28,7 @@
#include "DockWindow.h"
#include "Selection.h"
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class QPixmap;
class QTabWidget;

View File

@@ -32,7 +32,7 @@
#include <list>
#include <map>
#include <deque>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <CXX/Objects.hxx>
#include <Base/Observer.h>

View File

@@ -26,7 +26,7 @@
#include "TaskView.h"
#include <Gui/Selection.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace App {

View File

@@ -29,7 +29,7 @@
#include <map>
#include <string>
#include <vector>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QScrollArea>
#if !defined (QSINT_ACTIONPANEL)

View File

@@ -32,7 +32,7 @@
# include <QTextBlock>
# include <iostream>
# include <boost_bind_bind.hpp>
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
#endif

View File

@@ -25,7 +25,7 @@
#define GUI_TEXTDOCUMENTEDITORVIEW_H
#include <string>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QPlainTextEdit>
#include <App/TextDocument.h>

View File

@@ -29,7 +29,7 @@
#include <string>
#include <bitset>
#include <QIcon>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/intrusive_ptr.hpp>
#include <App/TransactionalObject.h>

View File

@@ -29,7 +29,7 @@
#include <gp_Ax2.hxx>
#include <vector>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <Mod/Drawing/App/FeatureViewPart.h>

View File

@@ -28,7 +28,7 @@
#include <Mod/Fem/App/FemPostFunction.h>
#include <Inventor/SbMatrix.h>
#include <QWidget>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class SoScale;
class SoSurroundScale;

View File

@@ -25,7 +25,7 @@
#include <QObject>
#include <Mod/Mesh/Gui/ViewProvider.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class SoCoordinate3;
class SoFaceSet;

View File

@@ -76,7 +76,7 @@
#include <QtGlobal>
// Boost
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/bind/bind.hpp>
#include <boost/tuple/tuple.hpp>

View File

@@ -25,7 +25,7 @@
#include <Gui/TaskView/TaskDialog.h>
#include <Gui/TaskView/TaskView.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class QTreeWidgetItem;

View File

@@ -177,7 +177,7 @@
#include <Python.h>
// Boost
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/bind/bind.hpp>
// Qt Toolkit

View File

@@ -24,7 +24,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <boost_bind_bind.hpp>
# include <BRep_Tool.hxx>
# include <BRepGProp.hxx>

View File

@@ -27,7 +27,7 @@
#include <App/PropertyStandard.h>
#include <Mod/Part/App/BodyBase.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace App {
class Origin;

View File

@@ -25,7 +25,7 @@
#define PARTDESIGN_DATUMSHAPE_H
#include <QString>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <App/PropertyLinks.h>
#include <Mod/Part/App/DatumFeature.h>

View File

@@ -25,7 +25,7 @@
#define GUI_TASKVIEW_TaskTransformedMessages_H
#include <Gui/TaskView/TaskView.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class Ui_TaskTransformedMessages;
typedef boost::signals2::connection Connection;

View File

@@ -23,7 +23,7 @@
#ifndef WORKFLOWMANAGER_H_PB7A5GCM
#define WORKFLOWMANAGER_H_PB7A5GCM
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <map>
namespace App {

View File

@@ -35,7 +35,7 @@
//#include <boost/progress.hpp>
//#include <boost/timer.hpp>
#include <boost/foreach.hpp>
#include <boost/python.hpp>
#include <boost_python.hpp>
#include <boost/python/module.hpp>
#include <boost/python/class.hpp>
#include <boost/python/wrapper.hpp>

View File

@@ -32,7 +32,7 @@
#include <App/Property.h>
#include <Mod/Part/App/Geometry.h>
#include "Constraint.h"
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/unordered/unordered_map.hpp>
namespace Base {

View File

@@ -32,7 +32,7 @@
#include "TaskSketcherGeneral.h"
#include "TaskSketcherMessages.h"
#include "TaskSketcherSolverAdvanced.h"
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
typedef boost::signals2::connection Connection;

View File

@@ -26,7 +26,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QListWidget>
namespace App {

View File

@@ -26,7 +26,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QListWidget>
#include <QIcon>

View File

@@ -26,7 +26,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class Ui_TaskSketcherGeneral;

View File

@@ -26,7 +26,7 @@
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
class Ui_TaskSketcherMessages;
typedef boost::signals2::connection Connection;

View File

@@ -33,7 +33,7 @@
#include <Gui/Selection.h>
#include <Gui/GLPainter.h>
#include <App/Part.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QCoreApplication>
#include <Gui/Document.h>
#include "ShortcutListener.h"

View File

@@ -24,7 +24,7 @@
#ifndef _DrawPage_h_
#define _DrawPage_h_
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <App/DocumentObject.h>
#include <App/DocumentObjectGroup.h>

View File

@@ -23,7 +23,7 @@
#ifndef _DrawView_h_
#define _DrawView_h_
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <QCoreApplication>
#include <QRectF>

View File

@@ -39,7 +39,7 @@
#include <QPrinter>
#include <QPrintDialog>
#include <QPrintPreviewDialog>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost_bind_bind.hpp>
#endif // #ifndef _PreComp_

View File

@@ -25,7 +25,7 @@
#include "PreCompiled.h"
#ifndef _PreComp_
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <boost/signals2/connection.hpp>
#include <boost_bind_bind.hpp>

View File

@@ -25,7 +25,7 @@
#ifndef TECHDRAWGUI_VIEWPROVIDERVIEW_H
#define TECHDRAWGUI_VIEWPROVIDERVIEW_H
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
#include <Gui/ViewProviderFeature.h>
#include <Gui/ViewProviderDocumentObjectGroup.h>

View File

@@ -32,7 +32,7 @@
# include <QTimer>
# include <QList>
# include <QPointer>
# include <boost/signals2.hpp>
# include <boost_signals2.hpp>
# include <boost/signals2/connection.hpp>
# include <boost_bind_bind.hpp>

View File

@@ -28,7 +28,7 @@
#include <QPointer>
#include <Gui/ViewProviderDocumentObject.h>
#include <boost/signals2.hpp>
#include <boost_signals2.hpp>
namespace TechDraw{
class DrawPage;

9
src/boost_python.hpp Normal file
View File

@@ -0,0 +1,9 @@
#ifndef FREECAD_BOOST_PYTHON_HPP_WORKAROUND
#define FREECAD_BOOST_PYTHON_HPP_WORKAROUND
// Workaround for boost >= 1.74
#define BOOST_ALLOW_DEPRECATED_HEADERS
#include <boost/python.hpp>
#undef BOOST_ALLOW_DEPRECATED_HEADERS
#endif // #ifndef FREECAD_BOOST_PYTHON_HPP_WORKAROUND

9
src/boost_signals2.hpp Normal file
View File

@@ -0,0 +1,9 @@
#ifndef FREECAD_SIGNALS2_HPP_WORKAROUND
#define FREECAD_SIGNALS2_HPP_WORKAROUND
// Workaround for boost >= 1.74
#define BOOST_ALLOW_DEPRECATED_HEADERS
#include <boost/signals2.hpp>
#undef BOOST_ALLOW_DEPRECATED_HEADERS
#endif // #ifndef FREECAD_SIGNALS2_HPP_WORKAROUND