From 0032f4e298f4f3b9ca1a392d49d4f6f1a468233f Mon Sep 17 00:00:00 2001 From: Benjamin Nauck Date: Sat, 6 Mar 2021 02:19:31 +0100 Subject: [PATCH] [Path] Switch from boost::tuple to std::tuple It's better to use the standard lib when possible --- src/Mod/Part/App/PreCompiled.h | 2 +- src/Mod/Part/Gui/TaskCheckGeometry.cpp | 4 ++-- src/Mod/Part/Gui/TaskCheckGeometry.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Part/App/PreCompiled.h b/src/Mod/Part/App/PreCompiled.h index 80a5cf2aa5..08731fb722 100644 --- a/src/Mod/Part/App/PreCompiled.h +++ b/src/Mod/Part/App/PreCompiled.h @@ -68,6 +68,7 @@ #include #include #include +#include #include #include @@ -79,7 +80,6 @@ #include #include -#include #include #include diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.cpp b/src/Mod/Part/Gui/TaskCheckGeometry.cpp index bff6047d35..baf4b55f56 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.cpp +++ b/src/Mod/Part/Gui/TaskCheckGeometry.cpp @@ -829,9 +829,9 @@ void TaskCheckGeometryResults::dispatchError(ResultEntry *entry, const BRepCheck std::vector::iterator mapIt; for (mapIt = functionMap.begin(); mapIt != functionMap.end(); ++mapIt) { - if ((*mapIt).get<0>() == entry->shape.ShapeType() && (*mapIt).get<1>() == stat) + if (std::get<0>(*mapIt) == entry->shape.ShapeType() && std::get<1>(*mapIt) == stat) { - ((*mapIt).get<2>())(entry); + (std::get<2>(*mapIt))(entry); return; } } diff --git a/src/Mod/Part/Gui/TaskCheckGeometry.h b/src/Mod/Part/Gui/TaskCheckGeometry.h index 93a1bc5318..41fe60943c 100644 --- a/src/Mod/Part/Gui/TaskCheckGeometry.h +++ b/src/Mod/Part/Gui/TaskCheckGeometry.h @@ -23,7 +23,7 @@ #ifndef TASKCHECKGEOMETRY_H #define TASKCHECKGEOMETRY_H -#include +#include #include #include #include @@ -73,7 +73,7 @@ void goSetupResultInvalidSameParameterFlag(ResultEntry *entry); void goSetupResultUnorientableShapeFace(ResultEntry *entry); typedef boost::function ResultFunction; -typedef boost::tuple FunctionMapType; +typedef std::tuple FunctionMapType; class ResultModel : public QAbstractItemModel {