Merge pull request #20142 from bofdahof/ranges

Apply C++20 std::ranges (mainly to std::find)
This commit is contained in:
Chris Hennes
2025-03-17 03:08:27 -05:00
committed by GitHub
93 changed files with 485 additions and 662 deletions

View File

@@ -1062,7 +1062,7 @@ bool ViewProviderAssembly::canDelete(App::DocumentObject* objBeingDeleted) const
auto* subAsmLink = dynamic_cast<AssemblyLink*>(obj);
auto* link = dynamic_cast<App::Link*>(obj);
if (subAsmLink || link) {
if (std::find(objs.begin(), objs.end(), obj) == objs.end()) {
if (std::ranges::find(objs, obj) == objs.end()) {
objs.push_back(obj);
if (subAsmLink && !asmLink->isRigid()) {
addSubComponents(subAsmLink, objs);
@@ -1085,7 +1085,7 @@ bool ViewProviderAssembly::canDelete(App::DocumentObject* objBeingDeleted) const
}
joints = assemblyPart->getJointsOfPart(obj);
for (auto* joint : joints) {
if (std::find(objToDel.begin(), objToDel.end(), joint) == objToDel.end()) {
if (std::ranges::find(objToDel, joint) == objToDel.end()) {
objToDel.push_back(joint);
}
}