From c48a569696d1c2e1d3bc458944a64e705a023871 Mon Sep 17 00:00:00 2001 From: mosfet80 Date: Fri, 24 Jun 2022 03:20:26 +0300 Subject: [PATCH] Boost version <=1.60 is never used in freecad 0.20 (#7038) * Boost version 1.60 is never used in freecad 0.20 --- cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 2 +- src/App/PropertyLinks.cpp | 1 - src/Gui/CommandView.cpp | 1 - src/Gui/DAGView/DAGModel.cpp | 1 - src/Gui/DAGView/DAGView.cpp | 1 - src/Gui/DlgDisplayPropertiesImp.cpp | 1 - src/Gui/MDIView.cpp | 1 - src/Gui/Tree.cpp | 1 - src/Mod/Drawing/Gui/TaskOrthoViews.cpp | 2 -- src/Mod/Fem/Gui/ViewProviderAnalysis.cpp | 1 - .../Fem/Gui/ViewProviderFemPostFunction.cpp | 2 -- src/Mod/Inspection/App/InspectionFeature.cpp | 2 -- src/Mod/Inspection/App/PreCompiled.h | 3 --- src/Mod/MeshPart/Gui/CrossSections.cpp | 1 - src/Mod/Part/App/PartFeature.cpp | 1 - src/Mod/Part/Gui/CrossSections.cpp | 1 - src/Mod/Part/Gui/DlgBooleanOperation.cpp | 1 - src/Mod/Part/Gui/DlgFilletEdges.cpp | 1 - src/Mod/Part/Gui/TaskAttacher.cpp | 1 - src/Mod/Part/Gui/TaskDimension.cpp | 2 -- src/Mod/Part/Gui/TaskFaceColors.cpp | 1 - src/Mod/Part/Gui/ViewProviderSpline.cpp | 1 - src/Mod/Path/App/Area.cpp | 6 +---- src/Mod/Path/App/PreCompiled.h | 6 +---- .../ReverseEngineering/App/ApproxSurface.cpp | 1 - src/Mod/Sketcher/App/SketchObject.cpp | 2 -- src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp | 3 --- .../Sketcher/Gui/TaskSketcherConstraints.cpp | 1 - src/Mod/Sketcher/Gui/TaskSketcherElements.cpp | 1 - src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp | 3 --- src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp | 6 ----- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 2 -- src/Mod/Spreadsheet/App/PropertySheet.cpp | 1 - src/Mod/Spreadsheet/Gui/SheetModel.cpp | 1 - src/Mod/Spreadsheet/Gui/SheetTableView.cpp | 1 - src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp | 1 - src/Mod/TechDraw/Gui/MDIViewPage.cpp | 2 -- .../TechDraw/Gui/ViewProviderDrawingView.cpp | 1 - src/Mod/TechDraw/Gui/ViewProviderPage.cpp | 1 - src/boost_bind_bind.hpp | 24 ------------------- 40 files changed, 3 insertions(+), 89 deletions(-) delete mode 100644 src/boost_bind_bind.hpp diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index 926deff843..fbc0a426fe 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -27,7 +27,7 @@ macro(PrintFinalReport) message(STATUS "pybind11: not enabled") endif(DEFINED pybind11_FOUND) - message(STATUS "Boost: ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION} (${Boost_VERSION})") + message(STATUS "Boost: ${Boost_VERSION}") message(STATUS "XercesC: ${XercesC_VERSION} [${XercesC_LIBRARIES}] [${XercesC_INCLUDE_DIRS}]") diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index 755dd626fb..4616ab12bc 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/src/Gui/CommandView.cpp b/src/Gui/CommandView.cpp index 0feab25f5d..b9b30aa9a6 100644 --- a/src/Gui/CommandView.cpp +++ b/src/Gui/CommandView.cpp @@ -40,7 +40,6 @@ # include # include # include -# include #endif #include diff --git a/src/Gui/DAGView/DAGModel.cpp b/src/Gui/DAGView/DAGModel.cpp index 57a1ca33aa..7eb0821964 100644 --- a/src/Gui/DAGView/DAGModel.cpp +++ b/src/Gui/DAGView/DAGModel.cpp @@ -22,7 +22,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include #include #include #include diff --git a/src/Gui/DAGView/DAGView.cpp b/src/Gui/DAGView/DAGView.cpp index a9e99c532f..3fbffeb5ef 100644 --- a/src/Gui/DAGView/DAGView.cpp +++ b/src/Gui/DAGView/DAGView.cpp @@ -22,7 +22,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include #include #include #include diff --git a/src/Gui/DlgDisplayPropertiesImp.cpp b/src/Gui/DlgDisplayPropertiesImp.cpp index 52173f6f34..26054989f1 100644 --- a/src/Gui/DlgDisplayPropertiesImp.cpp +++ b/src/Gui/DlgDisplayPropertiesImp.cpp @@ -23,7 +23,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ # include -# include # include # include #endif diff --git a/src/Gui/MDIView.cpp b/src/Gui/MDIView.cpp index 5ab1bb096b..f4be44e31e 100644 --- a/src/Gui/MDIView.cpp +++ b/src/Gui/MDIView.cpp @@ -24,7 +24,6 @@ #ifndef _PreComp_ # include -# include # include # include # include diff --git a/src/Gui/Tree.cpp b/src/Gui/Tree.cpp index dfbc7fbb33..d283d36be0 100644 --- a/src/Gui/Tree.cpp +++ b/src/Gui/Tree.cpp @@ -24,7 +24,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include diff --git a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp index 985203e09e..7e9230dcdd 100644 --- a/src/Mod/Drawing/Gui/TaskOrthoViews.cpp +++ b/src/Mod/Drawing/Gui/TaskOrthoViews.cpp @@ -38,8 +38,6 @@ #include #include -#include - using namespace Gui; using namespace DrawingGui; diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp index 231d46bb16..cbc179ddec 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp @@ -23,7 +23,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -# include # include # include # include diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp index 663dc027aa..6b2b853180 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostFunction.cpp @@ -41,8 +41,6 @@ # include # include -# include - # include #endif diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index a434bf95c3..e39b95f8e5 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -36,8 +36,6 @@ #include #include #include - -#include #endif #include diff --git a/src/Mod/Inspection/App/PreCompiled.h b/src/Mod/Inspection/App/PreCompiled.h index d08324db1e..2e8550c6e6 100644 --- a/src/Mod/Inspection/App/PreCompiled.h +++ b/src/Mod/Inspection/App/PreCompiled.h @@ -51,9 +51,6 @@ #include #include -// boost -#include - // OCC #include #include diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index 44460217bc..d05495878b 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -36,7 +36,6 @@ # include # include # include -# include # include # include # include diff --git a/src/Mod/Part/App/PartFeature.cpp b/src/Mod/Part/App/PartFeature.cpp index c9f0daa80e..dde5d962be 100644 --- a/src/Mod/Part/App/PartFeature.cpp +++ b/src/Mod/Part/App/PartFeature.cpp @@ -53,7 +53,6 @@ #endif #include -#include #include #include #include diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index 9aa772fb21..c31f2b458a 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -36,7 +36,6 @@ # include # include # include -# include # include # include # include diff --git a/src/Mod/Part/Gui/DlgBooleanOperation.cpp b/src/Mod/Part/Gui/DlgBooleanOperation.cpp index 3fe88c07a8..11f144e1aa 100644 --- a/src/Mod/Part/Gui/DlgBooleanOperation.cpp +++ b/src/Mod/Part/Gui/DlgBooleanOperation.cpp @@ -27,7 +27,6 @@ # include # include # include -# include #endif #include "DlgBooleanOperation.h" diff --git a/src/Mod/Part/Gui/DlgFilletEdges.cpp b/src/Mod/Part/Gui/DlgFilletEdges.cpp index 43241b1f0c..95d84ef7b2 100644 --- a/src/Mod/Part/Gui/DlgFilletEdges.cpp +++ b/src/Mod/Part/Gui/DlgFilletEdges.cpp @@ -43,7 +43,6 @@ # include # include # include -# include # include # include #endif diff --git a/src/Mod/Part/Gui/TaskAttacher.cpp b/src/Mod/Part/Gui/TaskAttacher.cpp index 28ce2ac5ff..ec5cdfa665 100644 --- a/src/Mod/Part/Gui/TaskAttacher.cpp +++ b/src/Mod/Part/Gui/TaskAttacher.cpp @@ -31,7 +31,6 @@ # include # include # include -# include #endif #include diff --git a/src/Mod/Part/Gui/TaskDimension.cpp b/src/Mod/Part/Gui/TaskDimension.cpp index b9c217c5bf..8ca37dd9a8 100644 --- a/src/Mod/Part/Gui/TaskDimension.cpp +++ b/src/Mod/Part/Gui/TaskDimension.cpp @@ -26,8 +26,6 @@ # include # include # include -# include - # include # include # include diff --git a/src/Mod/Part/Gui/TaskFaceColors.cpp b/src/Mod/Part/Gui/TaskFaceColors.cpp index 7ee4543ebd..4b1a21d81a 100644 --- a/src/Mod/Part/Gui/TaskFaceColors.cpp +++ b/src/Mod/Part/Gui/TaskFaceColors.cpp @@ -24,7 +24,6 @@ #ifndef _PreComp_ # include -# include # include # include # include diff --git a/src/Mod/Part/Gui/ViewProviderSpline.cpp b/src/Mod/Part/Gui/ViewProviderSpline.cpp index 3f56882418..a51c6174d9 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.cpp +++ b/src/Mod/Part/Gui/ViewProviderSpline.cpp @@ -44,7 +44,6 @@ # include # include # include -# include #endif #include diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 731cf744f6..62b36d7f2e 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -30,11 +30,7 @@ # include # include # include -# if defined(BOOST_MSVC) && (BOOST_VERSION == 105500) -// for fixing issue https://svn.boost.org/trac/boost/ticket/9332 -# include "boost_fix/intrusive/detail/memory_util.hpp" -# include "boost_fix/container/detail/memory_util.hpp" -# endif + # include # include # include diff --git a/src/Mod/Path/App/PreCompiled.h b/src/Mod/Path/App/PreCompiled.h index f623727e1a..2d814c4266 100644 --- a/src/Mod/Path/App/PreCompiled.h +++ b/src/Mod/Path/App/PreCompiled.h @@ -60,11 +60,7 @@ // Boost #include #include -#if defined(BOOST_MSVC) && (BOOST_VERSION == 105500) -// for fixing issue https://svn.boost.org/trac/boost/ticket/9332 -# include "boost_fix/intrusive/detail/memory_util.hpp" -# include "boost_fix/container/detail/memory_util.hpp" -#endif + #include #include #include diff --git a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp index 9828fde192..c78de802ef 100644 --- a/src/Mod/ReverseEngineering/App/ApproxSurface.cpp +++ b/src/Mod/ReverseEngineering/App/ApproxSurface.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 2d6f596348..81e6c4bb41 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -59,8 +59,6 @@ # include # include # include -# include -//# include #endif #include diff --git a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp index f522949c9e..43d5fd1bdc 100644 --- a/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp +++ b/src/Mod/Sketcher/Gui/TaskDlgEditSketch.cpp @@ -23,9 +23,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif #include "TaskDlgEditSketch.h" #include "ViewProviderSketch.h" diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp index 6c69ba3c9d..cf67d86d23 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp @@ -34,7 +34,6 @@ # include # include # include -# include #endif #include "TaskSketcherConstraints.h" diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index 0261a9f825..51e390ffc2 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -31,7 +31,6 @@ # include # include # include -# include #endif #include "TaskSketcherElements.h" diff --git a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp index 959b64f697..d86d81af4a 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherGeneral.cpp @@ -23,9 +23,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -#include -#endif #include "ui_TaskSketcherGeneral.h" #include "TaskSketcherGeneral.h" diff --git a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp index e7eff19f60..57c7356560 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp @@ -23,10 +23,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - #include "ui_TaskSketcherMessages.h" #include "TaskSketcherMessages.h" #include @@ -37,8 +33,6 @@ #include #include - - #include #include "ViewProviderSketch.h" diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index dd39d9cae1..0f5b8b8b3f 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -47,8 +47,6 @@ # include # include # include - -# include #endif /// Here the FreeCAD includes sorted by Base,App,Gui...... diff --git a/src/Mod/Spreadsheet/App/PropertySheet.cpp b/src/Mod/Spreadsheet/App/PropertySheet.cpp index 63c88accd3..f1ffbad298 100644 --- a/src/Mod/Spreadsheet/App/PropertySheet.cpp +++ b/src/Mod/Spreadsheet/App/PropertySheet.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Mod/Spreadsheet/Gui/SheetModel.cpp b/src/Mod/Spreadsheet/Gui/SheetModel.cpp index 7caa79948f..259faa4808 100644 --- a/src/Mod/Spreadsheet/Gui/SheetModel.cpp +++ b/src/Mod/Spreadsheet/Gui/SheetModel.cpp @@ -39,7 +39,6 @@ #include #include #include -#include using namespace SpreadsheetGui; using namespace Spreadsheet; diff --git a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp index a6b3d73baa..3b1af956c4 100644 --- a/src/Mod/Spreadsheet/Gui/SheetTableView.cpp +++ b/src/Mod/Spreadsheet/Gui/SheetTableView.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include "../App/Utils.h" #include "../App/Cell.h" #include diff --git a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp index dd2f52d22d..8b0d104c7c 100644 --- a/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp +++ b/src/Mod/Spreadsheet/Gui/SpreadsheetView.cpp @@ -43,7 +43,6 @@ #include #include #include -#include #include #include #include diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 57cf3ae8c4..2648a6c7e3 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -41,8 +41,6 @@ #include #include #include - #include - #endif // #ifndef _PreComp_ #include diff --git a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp index 0662e610aa..d692b424a4 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderDrawingView.cpp @@ -24,7 +24,6 @@ #include "PreCompiled.h" #ifndef _PreComp_ -#include #include #include #endif diff --git a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp index 053a5b2597..622f034def 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderPage.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderPage.cpp @@ -31,7 +31,6 @@ # include # include # include -# include # include # include #endif diff --git a/src/boost_bind_bind.hpp b/src/boost_bind_bind.hpp deleted file mode 100644 index 4fc292c295..0000000000 --- a/src/boost_bind_bind.hpp +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef FREECAD_BIND_BIND_HPP_WORKAROUND -#define FREECAD_BIND_BIND_HPP_WORKAROUND - -// Workaround for boost older than 1.60 -#ifndef BOOST_BIND_BIND_HPP_INCLUDED -#include -#endif - -#include -#if (BOOST_VERSION < 106000) -namespace boost { namespace placeholders { - using ::_1; - using ::_2; - using ::_3; - using ::_4; - using ::_5; - using ::_6; - using ::_7; - using ::_8; - using ::_9; -}}; -#endif - -#endif // #ifndef FREECAD_BIND_BIND_HPP_WORKAROUND