From 98f63ba60f093db50eafc6ac1c360bd1b09b72bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= Date: Mon, 28 Dec 2020 19:15:57 +0100 Subject: [PATCH] Fix build warnings from deprecated Boost headers (they are used internally by Boost). Thanks @wwmayer for the hint. --- src/App/Application.h | 2 +- src/App/Document.h | 2 +- src/App/DocumentObject.h | 2 +- src/App/DocumentObserver.h | 2 +- src/App/DocumentObserverPython.h | 2 +- src/App/GroupExtension.h | 2 +- src/App/Link.h | 2 +- src/App/MergeDocuments.h | 2 +- src/App/PreCompiled.h | 2 +- src/App/PropertyExpressionEngine.h | 2 +- src/App/PropertyLinks.h | 2 +- src/App/TextDocument.cpp | 2 +- src/App/TextDocument.h | 2 +- src/Base/Tools.h | 2 +- src/Gui/Action.cpp | 2 +- src/Gui/Application.cpp | 2 +- src/Gui/AutoSaver.h | 2 +- src/Gui/DAGView/DAGModel.h | 2 +- src/Gui/DAGView/DAGModelGraph.h | 2 +- src/Gui/DlgDisplayPropertiesImp.cpp | 2 +- src/Gui/Document.cpp | 2 +- src/Gui/DocumentModel.cpp | 2 +- src/Gui/DocumentObserver.h | 2 +- src/Gui/DocumentObserverPython.h | 2 +- src/Gui/ExpressionBinding.h | 2 +- src/Gui/GraphvizView.h | 2 +- src/Gui/MDIView.cpp | 2 +- src/Gui/ManualAlignment.h | 2 +- src/Gui/MergeDocuments.h | 2 +- src/Gui/Placement.h | 2 +- src/Gui/PreCompiled.h | 2 +- src/Gui/PropertyView.h | 2 +- src/Gui/Selection.h | 2 +- src/Gui/TaskView/TaskAppearance.h | 2 +- src/Gui/TaskView/TaskView.h | 2 +- src/Gui/TextDocumentEditorView.cpp | 2 +- src/Gui/TextDocumentEditorView.h | 2 +- src/Gui/ViewProvider.h | 2 +- src/Mod/Drawing/Gui/TaskOrthoViews.h | 2 +- src/Mod/Fem/Gui/ViewProviderFemPostFunction.h | 2 +- src/Mod/Mesh/Gui/MeshEditor.h | 2 +- src/Mod/Part/App/PreCompiled.h | 2 +- src/Mod/Part/Gui/DlgBooleanOperation.h | 2 +- src/Mod/Part/Gui/PreCompiled.h | 2 +- src/Mod/Part/Gui/TaskFaceColors.cpp | 2 +- src/Mod/PartDesign/App/Body.h | 2 +- src/Mod/PartDesign/App/ShapeBinder.h | 2 +- src/Mod/PartDesign/Gui/TaskTransformedMessages.h | 2 +- src/Mod/PartDesign/Gui/WorkflowManager.h | 2 +- src/Mod/Path/libarea/PythonStuff.cpp | 2 +- src/Mod/Sketcher/App/PropertyConstraintList.h | 2 +- src/Mod/Sketcher/Gui/TaskDlgEditSketch.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherConstrains.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherElements.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherGeneral.h | 2 +- src/Mod/Sketcher/Gui/TaskSketcherMessages.h | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.h | 2 +- src/Mod/TechDraw/App/DrawPage.h | 2 +- src/Mod/TechDraw/App/DrawView.h | 2 +- src/Mod/TechDraw/Gui/MDIViewPage.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderDrawingView.h | 2 +- src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderPage.h | 2 +- src/boost_python.hpp | 9 +++++++++ src/boost_signals2.hpp | 9 +++++++++ 66 files changed, 82 insertions(+), 64 deletions(-) create mode 100644 src/boost_python.hpp create mode 100644 src/boost_signals2.hpp diff --git a/src/App/Application.h b/src/App/Application.h index f03dc97f99..317d4ca9a1 100644 --- a/src/App/Application.h +++ b/src/App/Application.h @@ -24,7 +24,7 @@ #ifndef APP_APPLICATION_H #define APP_APPLICATION_H -#include +#include #include #include diff --git a/src/App/Document.h b/src/App/Document.h index 33084d221f..b1d57cb28f 100644 --- a/src/App/Document.h +++ b/src/App/Document.h @@ -37,7 +37,7 @@ #include #include -#include +#include namespace Base { class Writer; diff --git a/src/App/DocumentObject.h b/src/App/DocumentObject.h index dec9f52540..e9f32386e8 100644 --- a/src/App/DocumentObject.h +++ b/src/App/DocumentObject.h @@ -36,7 +36,7 @@ #include #include -#include +#include namespace App { diff --git a/src/App/DocumentObserver.h b/src/App/DocumentObserver.h index 2b79752fed..1a163d37c2 100644 --- a/src/App/DocumentObserver.h +++ b/src/App/DocumentObserver.h @@ -25,7 +25,7 @@ #define APP_DOCUMENTOBSERVER_H #include -#include +#include #include #include diff --git a/src/App/DocumentObserverPython.h b/src/App/DocumentObserverPython.h index c1ee595cf1..3c9957836b 100644 --- a/src/App/DocumentObserverPython.h +++ b/src/App/DocumentObserverPython.h @@ -26,7 +26,7 @@ #include -#include +#include #include #include diff --git a/src/App/GroupExtension.h b/src/App/GroupExtension.h index e5a3e7f52a..9940f44352 100644 --- a/src/App/GroupExtension.h +++ b/src/App/GroupExtension.h @@ -24,7 +24,7 @@ #ifndef APP_GROUPEXTENSION_H #define APP_GROUPEXTENSION_H -#include +#include #include "FeaturePython.h" #include "DocumentObject.h" #include "PropertyLinks.h" diff --git a/src/App/Link.h b/src/App/Link.h index 143c44f573..25edbf1e8b 100644 --- a/src/App/Link.h +++ b/src/App/Link.h @@ -24,7 +24,7 @@ #define APP_LINK_H #include -#include +#include #include #include #include diff --git a/src/App/MergeDocuments.h b/src/App/MergeDocuments.h index dc89f1db16..3f807e2bfd 100644 --- a/src/App/MergeDocuments.h +++ b/src/App/MergeDocuments.h @@ -24,7 +24,7 @@ #ifndef APP_MERGEDOCUMENTS_H #define APP_MERGEDOCUMENTS_H -#include +#include #include namespace zipios { diff --git a/src/App/PreCompiled.h b/src/App/PreCompiled.h index ef5fe98b67..634cfe55a4 100644 --- a/src/App/PreCompiled.h +++ b/src/App/PreCompiled.h @@ -80,7 +80,7 @@ #include // Boost -#include +#include #include #include diff --git a/src/App/PropertyExpressionEngine.h b/src/App/PropertyExpressionEngine.h index b1701034e2..4b63a8b147 100644 --- a/src/App/PropertyExpressionEngine.h +++ b/src/App/PropertyExpressionEngine.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/App/PropertyLinks.h b/src/App/PropertyLinks.h index 6d5bf6e83c..5e63a648b0 100644 --- a/src/App/PropertyLinks.h +++ b/src/App/PropertyLinks.h @@ -25,7 +25,7 @@ #define APP_PROPERTYLINKS_H // Std. configurations -#include +#include #include #include diff --git a/src/App/TextDocument.cpp b/src/App/TextDocument.cpp index 63cd196882..82e4416d8c 100644 --- a/src/App/TextDocument.cpp +++ b/src/App/TextDocument.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include "DocumentObject.h" #include "TextDocument.h" diff --git a/src/App/TextDocument.h b/src/App/TextDocument.h index 5f89ff3b48..2a57b301df 100644 --- a/src/App/TextDocument.h +++ b/src/App/TextDocument.h @@ -26,7 +26,7 @@ #include -#include +#include #include "DocumentObject.h" #include "PropertyStandard.h" diff --git a/src/Base/Tools.h b/src/Base/Tools.h index 1dfabd1ba2..e0f007f1fa 100644 --- a/src/Base/Tools.h +++ b/src/Base/Tools.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Gui/Action.cpp b/src/Gui/Action.cpp index cdc92643d1..368b06bce3 100644 --- a/src/Gui/Action.cpp +++ b/src/Gui/Action.cpp @@ -24,7 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include # include # include # include diff --git a/src/Gui/Application.cpp b/src/Gui/Application.cpp index ea4c6a76d9..e301134f9a 100644 --- a/src/Gui/Application.cpp +++ b/src/Gui/Application.cpp @@ -25,7 +25,7 @@ #ifndef _PreComp_ # include "InventorAll.h" -# include +# include # include # include # include diff --git a/src/Gui/AutoSaver.h b/src/Gui/AutoSaver.h index 6766f763b5..0c6c36bd3b 100644 --- a/src/Gui/AutoSaver.h +++ b/src/Gui/AutoSaver.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include namespace App { class Document; diff --git a/src/Gui/DAGView/DAGModel.h b/src/Gui/DAGView/DAGModel.h index 022f3c3401..d362fa8497 100644 --- a/src/Gui/DAGView/DAGModel.h +++ b/src/Gui/DAGView/DAGModel.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/Gui/DAGView/DAGModelGraph.h b/src/Gui/DAGView/DAGModelGraph.h index b605872d87..cd48bff21e 100644 --- a/src/Gui/DAGView/DAGModelGraph.h +++ b/src/Gui/DAGView/DAGModelGraph.h @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "DAGRectItem.h" diff --git a/src/Gui/DlgDisplayPropertiesImp.cpp b/src/Gui/DlgDisplayPropertiesImp.cpp index f3812d158e..2a52d7db4a 100644 --- a/src/Gui/DlgDisplayPropertiesImp.cpp +++ b/src/Gui/DlgDisplayPropertiesImp.cpp @@ -25,7 +25,7 @@ #ifndef _PreComp_ # include # include -# include +# include # include #endif diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 51e97c648a..4b28736248 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -33,7 +33,7 @@ # include # include # include -# include +# include # include # include # include diff --git a/src/Gui/DocumentModel.cpp b/src/Gui/DocumentModel.cpp index 228e5a0df7..4f2e03faec 100644 --- a/src/Gui/DocumentModel.cpp +++ b/src/Gui/DocumentModel.cpp @@ -26,7 +26,7 @@ #ifndef _PreComp_ # include # include -# include +# include # include #endif diff --git a/src/Gui/DocumentObserver.h b/src/Gui/DocumentObserver.h index d09ea3c382..9e4fca62f2 100644 --- a/src/Gui/DocumentObserver.h +++ b/src/Gui/DocumentObserver.h @@ -25,7 +25,7 @@ #define GUI_DOCUMENTOBSERVER_H #include -#include +#include namespace App { class Property; } namespace Gui diff --git a/src/Gui/DocumentObserverPython.h b/src/Gui/DocumentObserverPython.h index 96d9196008..16713c001c 100644 --- a/src/Gui/DocumentObserverPython.h +++ b/src/Gui/DocumentObserverPython.h @@ -26,7 +26,7 @@ #include -#include +#include #include namespace Gui diff --git a/src/Gui/ExpressionBinding.h b/src/Gui/ExpressionBinding.h index 40c1604fb2..db486bb993 100644 --- a/src/Gui/ExpressionBinding.h +++ b/src/Gui/ExpressionBinding.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace App { class Expression; diff --git a/src/Gui/GraphvizView.h b/src/Gui/GraphvizView.h index 0fc516dbb4..d13bc240f9 100644 --- a/src/Gui/GraphvizView.h +++ b/src/Gui/GraphvizView.h @@ -26,7 +26,7 @@ #include "MDIView.h" #include -#include +#include class QGraphicsScene; diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp index 0e64d1a7e5..a571aaccf4 100644 --- a/src/Gui/MDIView.cpp +++ b/src/Gui/MDIView.cpp @@ -24,7 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include # include # include # include diff --git a/src/Gui/ManualAlignment.h b/src/Gui/ManualAlignment.h index 121c3b7ee3..83416e5ed8 100644 --- a/src/Gui/ManualAlignment.h +++ b/src/Gui/ManualAlignment.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include class SbVec3f; class SoPickedPoint; diff --git a/src/Gui/MergeDocuments.h b/src/Gui/MergeDocuments.h index d4d1be0f3d..1539e9d0ea 100644 --- a/src/Gui/MergeDocuments.h +++ b/src/Gui/MergeDocuments.h @@ -24,7 +24,7 @@ #ifndef GUI_MERGEDOCUMENTS_H #define GUI_MERGEDOCUMENTS_H -#include +#include #include namespace zipios { diff --git a/src/Gui/Placement.h b/src/Gui/Placement.h index 7437bd5d02..e71fa61dcb 100644 --- a/src/Gui/Placement.h +++ b/src/Gui/Placement.h @@ -29,7 +29,7 @@ #include #include -#include +#include class QSignalMapper; diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h index 7163d51450..4aef35543a 100644 --- a/src/Gui/PreCompiled.h +++ b/src/Gui/PreCompiled.h @@ -79,7 +79,7 @@ #include // Boost -#include +#include #include #include #include diff --git a/src/Gui/PropertyView.h b/src/Gui/PropertyView.h index bac0dde71c..9d052ff76a 100644 --- a/src/Gui/PropertyView.h +++ b/src/Gui/PropertyView.h @@ -28,7 +28,7 @@ #include "DockWindow.h" #include "Selection.h" -#include +#include class QPixmap; class QTabWidget; diff --git a/src/Gui/Selection.h b/src/Gui/Selection.h index 90f4df024b..da62babcd2 100644 --- a/src/Gui/Selection.h +++ b/src/Gui/Selection.h @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Gui/TaskView/TaskAppearance.h b/src/Gui/TaskView/TaskAppearance.h index b637053f33..cf0975db30 100644 --- a/src/Gui/TaskView/TaskAppearance.h +++ b/src/Gui/TaskView/TaskAppearance.h @@ -26,7 +26,7 @@ #include "TaskView.h" #include -#include +#include namespace App { diff --git a/src/Gui/TaskView/TaskView.h b/src/Gui/TaskView/TaskView.h index 20463eee64..852a9f261f 100644 --- a/src/Gui/TaskView/TaskView.h +++ b/src/Gui/TaskView/TaskView.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #if !defined (QSINT_ACTIONPANEL) diff --git a/src/Gui/TextDocumentEditorView.cpp b/src/Gui/TextDocumentEditorView.cpp index 4f8481d3e6..257a97b47b 100644 --- a/src/Gui/TextDocumentEditorView.cpp +++ b/src/Gui/TextDocumentEditorView.cpp @@ -32,7 +32,7 @@ # include # include # include -# include +# include #endif diff --git a/src/Gui/TextDocumentEditorView.h b/src/Gui/TextDocumentEditorView.h index 9c5def6e2a..f53f03f7eb 100644 --- a/src/Gui/TextDocumentEditorView.h +++ b/src/Gui/TextDocumentEditorView.h @@ -25,7 +25,7 @@ #define GUI_TEXTDOCUMENTEDITORVIEW_H #include -#include +#include #include #include diff --git a/src/Gui/ViewProvider.h b/src/Gui/ViewProvider.h index 6543c00ac9..9c489e55eb 100644 --- a/src/Gui/ViewProvider.h +++ b/src/Gui/ViewProvider.h @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.h b/src/Mod/Drawing/Gui/TaskOrthoViews.h index ccab188d51..5e19f1d24f 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.h +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h index 0956f77adf..a5d240be98 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include class SoScale; class SoSurroundScale; diff --git a/src/Mod/Mesh/Gui/MeshEditor.h b/src/Mod/Mesh/Gui/MeshEditor.h index 9d5b248ff4..6675d73620 100644 --- a/src/Mod/Mesh/Gui/MeshEditor.h +++ b/src/Mod/Mesh/Gui/MeshEditor.h @@ -25,7 +25,7 @@ #include #include -#include +#include class SoCoordinate3; class SoFaceSet; diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index 16377c8016..a7cc360af3 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -76,7 +76,7 @@ #include // Boost -#include +#include #include #include diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.h b/src/Mod/Part/Gui/DlgBooleanOperation.h index 03e8d1cbf2..0a5a624a8c 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.h +++ b/src/Mod/Part/Gui/DlgBooleanOperation.h @@ -25,7 +25,7 @@ #include #include -#include +#include class QTreeWidgetItem; diff --git a/src/Mod/Part/Gui/PreCompiled.h b/src/Mod/Part/Gui/PreCompiled.h index c9de57fc46..beff950e4d 100644 --- a/src/Mod/Part/Gui/PreCompiled.h +++ b/src/Mod/Part/Gui/PreCompiled.h @@ -177,7 +177,7 @@ #include // Boost -#include +#include #include // Qt Toolkit diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp index 980a12b5b7..d7195a65be 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.cpp +++ b/src/Mod/Part/Gui/TaskFaceColors.cpp @@ -24,7 +24,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include +# include # include # include # include diff --git a/src/Mod/PartDesign/App/Body.h b/src/Mod/PartDesign/App/Body.h index 5cbd717f53..3ba7bfbbc7 100644 --- a/src/Mod/PartDesign/App/Body.h +++ b/src/Mod/PartDesign/App/Body.h @@ -27,7 +27,7 @@ #include #include -#include +#include namespace App { class Origin; diff --git a/src/Mod/PartDesign/App/ShapeBinder.h b/src/Mod/PartDesign/App/ShapeBinder.h index 8cb528a65b..ba7c548cd4 100644 --- a/src/Mod/PartDesign/App/ShapeBinder.h +++ b/src/Mod/PartDesign/App/ShapeBinder.h @@ -25,7 +25,7 @@ #define PARTDESIGN_DATUMSHAPE_H #include -#include +#include #include #include diff --git a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h index e95aa9f73d..ad1b349488 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedMessages.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedMessages.h @@ -25,7 +25,7 @@ #define GUI_TASKVIEW_TaskTransformedMessages_H #include -#include +#include class Ui_TaskTransformedMessages; typedef boost::signals2::connection Connection; diff --git a/src/Mod/PartDesign/Gui/WorkflowManager.h b/src/Mod/PartDesign/Gui/WorkflowManager.h index 4ff9ca643e..a66e7e10d1 100644 --- a/src/Mod/PartDesign/Gui/WorkflowManager.h +++ b/src/Mod/PartDesign/Gui/WorkflowManager.h @@ -23,7 +23,7 @@ #ifndef WORKFLOWMANAGER_H_PB7A5GCM #define WORKFLOWMANAGER_H_PB7A5GCM -#include +#include #include namespace App { diff --git a/src/Mod/Path/libarea/PythonStuff.cpp b/src/Mod/Path/libarea/PythonStuff.cpp index 9f531086de..d82715b1e8 100644 --- a/src/Mod/Path/libarea/PythonStuff.cpp +++ b/src/Mod/Path/libarea/PythonStuff.cpp @@ -35,7 +35,7 @@ //#include //#include #include -#include +#include #include #include #include diff --git a/src/Mod/Sketcher/App/PropertyConstraintList.h b/src/Mod/Sketcher/App/PropertyConstraintList.h index 10c6c0bee2..27ff8aec6f 100644 --- a/src/Mod/Sketcher/App/PropertyConstraintList.h +++ b/src/Mod/Sketcher/App/PropertyConstraintList.h @@ -32,7 +32,7 @@ #include #include #include "Constraint.h" -#include +#include #include namespace Base { diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h index 6138dab26d..e99900e13d 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.h @@ -32,7 +32,7 @@ #include "TaskSketcherGeneral.h" #include "TaskSketcherMessages.h" #include "TaskSketcherSolverAdvanced.h" -#include +#include typedef boost::signals2::connection Connection; diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h index 94f1a3e553..fc52458bf1 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include namespace App { diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.h b/src/Mod/Sketcher/Gui/TaskSketcherElements.h index 3eb325fd23..86e69c47e3 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h index 974318a1c8..1cdd92923a 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.h @@ -26,7 +26,7 @@ #include #include -#include +#include class Ui_TaskSketcherGeneral; diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h index 3e230f1d24..09193959d6 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.h @@ -26,7 +26,7 @@ #include #include -#include +#include class Ui_TaskSketcherMessages; typedef boost::signals2::connection Connection; diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.h b/src/Mod/Sketcher/Gui/ViewProviderSketch.h index 6d42806956..40333868da 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.h +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include "ShortcutListener.h" diff --git a/src/Mod/TechDraw/App/DrawPage.h b/src/Mod/TechDraw/App/DrawPage.h index e298f52078..17b2c383bd 100644 --- a/src/Mod/TechDraw/App/DrawPage.h +++ b/src/Mod/TechDraw/App/DrawPage.h @@ -24,7 +24,7 @@ #ifndef _DrawPage_h_ #define _DrawPage_h_ -#include +#include #include #include diff --git a/src/Mod/TechDraw/App/DrawView.h b/src/Mod/TechDraw/App/DrawView.h index 696f4af4a6..170ad493ab 100644 --- a/src/Mod/TechDraw/App/DrawView.h +++ b/src/Mod/TechDraw/App/DrawView.h @@ -23,7 +23,7 @@ #ifndef _DrawView_h_ #define _DrawView_h_ -#include +#include #include #include diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 097adf5b7e..1cfe08c1a6 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -39,7 +39,7 @@ #include #include #include - #include + #include #include #endif // #ifndef _PreComp_ diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index 8c345713bc..c43049cd1f 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -25,7 +25,7 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include +#include #include #include diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h index f1828c713d..b778363843 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.h @@ -25,7 +25,7 @@ #ifndef TECHDRAWGUI_VIEWPROVIDERVIEW_H #define TECHDRAWGUI_VIEWPROVIDERVIEW_H -#include +#include #include #include diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 524df6912a..09263fa216 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -32,7 +32,7 @@ # include # include # include -# include +# include # include # include diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.h b/src/Mod/TechDraw/Gui/ViewProviderPage.h index 13bb28b023..443feb3047 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.h +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.h @@ -28,7 +28,7 @@ #include #include -#include +#include namespace TechDraw{ class DrawPage; diff --git a/src/boost_python.hpp b/src/boost_python.hpp new file mode 100644 index 0000000000..6144219310 --- /dev/null +++ b/src/boost_python.hpp @@ -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 +#undef BOOST_ALLOW_DEPRECATED_HEADERS + +#endif // #ifndef FREECAD_BOOST_PYTHON_HPP_WORKAROUND diff --git a/src/boost_signals2.hpp b/src/boost_signals2.hpp new file mode 100644 index 0000000000..8034a2c92c --- /dev/null +++ b/src/boost_signals2.hpp @@ -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 +#undef BOOST_ALLOW_DEPRECATED_HEADERS + +#endif // #ifndef FREECAD_SIGNALS2_HPP_WORKAROUND