kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

boost 1.73.0: The practice of declaring the Bind placeholders (_1, _2, ...) in the global namespace is deprecated

Browse Source
This commit is contained in:
wmayer
2020-06-09 12:55:29 +02:00
committed by wwmayer
parent 3f212ad8ac
commit 4ec45b545e
112 changed files with 451 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/Mesh/App/Core/Curvature.cpp
View File

@@ -28,7 +28,7 @@
#include <QFuture>
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
//#define OPTIMIZE_CURVATURE
#ifdef OPTIMIZE_CURVATURE
@@ -48,6 +48,7 @@
#include <Base/Tools.h>
using namespace MeshCore;
namespace bp = boost::placeholders;
MeshCurvature::MeshCurvature(const MeshKernel& kernel)
: myKernel(kernel), myMinPoints(20), myRadius(0.5f)
@@ -79,7 +80,7 @@ void MeshCurvature::ComputePerFace(bool parallel)
}
else {
QFuture<CurvatureInfo> future = QtConcurrent::mapped
(mySegment, boost::bind(&FacetCurvature::Compute, &face, _1));
(mySegment, boost::bind(&FacetCurvature::Compute, &face, bp::_1));
QFutureWatcher<CurvatureInfo> watcher;
watcher.setFuture(future);
watcher.waitForFinished();

2
src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
View File

@@ -31,8 +31,6 @@
#include "ui_DlgEvaluateMesh.h"
#include "DlgEvaluateSettings.h"
#include <boost/bind.hpp>
#include <Base/Interpreter.h>
#include <Base/Sequencer.h>
#include <Gui/Application.h>

5
src/Mod/Mesh/Gui/MeshEditor.cpp
View File

@@ -45,7 +45,7 @@
# include <Inventor/nodes/SoPickStyle.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoShapeHints.h>
# include <boost/bind.hpp>
# include <boost/bind/bind.hpp>
#endif
#include "MeshEditor.h"
@@ -61,6 +61,7 @@
#include <Gui/View3DInventorViewer.h>
using namespace MeshGui;
namespace bp = boost::placeholders;
PROPERTY_SOURCE(MeshGui::ViewProviderFace, Gui::ViewProviderDocumentObject)
@@ -477,7 +478,7 @@ void MeshFillHole::startEditing(MeshGui::ViewProviderMesh* vp)
viewer->addEventCallback(SoEvent::getClassTypeId(),
MeshFillHole::fileHoleCallback, this);
myConnection = App::GetApplication().signalChangedObject.connect(
boost::bind(&MeshFillHole::slotChangedObject, this, _1, _2));
boost::bind(&MeshFillHole::slotChangedObject, this, bp::_1, bp::_2));
Gui::coinRemoveAllChildren(myBoundariesRoot);
myBoundariesRoot->addChild(viewer->getHeadlight());

10
src/Mod/Mesh/Gui/ViewProvider.cpp
View File

@@ -57,7 +57,7 @@
#include <QFuture>
#include <QFutureWatcher>
#include <QtConcurrentMap>
#include <boost/bind.hpp>
#include <boost/bind/bind.hpp>
/// Here the FreeCAD includes sorted by Base,App,Gui......
#include <Base/Console.h>
@@ -100,7 +100,6 @@
#include <Mod/Mesh/App/MeshFeature.h>
#include <Mod/Mesh/Gui/ViewProviderMeshPy.h>
#include <zipios++/gzipoutputstream.h>
#include <boost/bind.hpp>
#include "ViewProvider.h"
#include "SoFCIndexedFaceSet.h"
@@ -108,6 +107,7 @@
using namespace MeshGui;
namespace bp = boost::placeholders;
using Mesh::Feature;
using MeshCore::MeshKernel;
@@ -739,13 +739,13 @@ void ViewProviderMesh::setupContextMenu(QMenu* menu, QObject* receiver, const ch
act->setCheckable(true);
act->setChecked(pcMatBinding->value.getValue() == SoMaterialBinding::PER_FACE &&
highlightMode == "Component");
func->toggle(act, boost::bind(&ViewProviderMesh::setHighlightedComponents, this, _1));
func->toggle(act, boost::bind(&ViewProviderMesh::setHighlightedComponents, this, bp::_1));
QAction* seg = menu->addAction(QObject::tr("Display segments"));
seg->setCheckable(true);
seg->setChecked(pcMatBinding->value.getValue() == SoMaterialBinding::PER_FACE &&
highlightMode == "Segment");
func->toggle(seg, boost::bind(&ViewProviderMesh::setHighlightedSegments, this, _1));
func->toggle(seg, boost::bind(&ViewProviderMesh::setHighlightedSegments, this, bp::_1));
}
bool ViewProviderMesh::setEdit(int ModNum)
@@ -1383,7 +1383,7 @@ std::vector<unsigned long> ViewProviderMesh::getVisibleFacets(const SbViewportRe
Vertex v(kernel, grid, Base::convertTo<Base::Vector3f>(pos));
QFuture<bool> future = QtConcurrent::mapped
(points, boost::bind(&Vertex::visible, &v, _1));
(points, boost::bind(&Vertex::visible, &v, bp::_1));
QFutureWatcher<bool> watcher;
watcher.setFuture(future);
watcher.waitForFinished();