From 62942f3d0045ca61b39fac85d0c8d6d381f7a280 Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Thu, 10 Mar 2022 09:23:09 +0100
Subject: [PATCH] blacklist -> blocklist
---
source/RobotAPI/libraries/ArmarXObjects/util.cpp | 8 ++++----
source/RobotAPI/libraries/ArmarXObjects/util.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/source/RobotAPI/libraries/ArmarXObjects/util.cpp b/source/RobotAPI/libraries/ArmarXObjects/util.cpp
index 5aee6b10d..3dd90c141 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/util.cpp
+++ b/source/RobotAPI/libraries/ArmarXObjects/util.cpp
@@ -34,14 +34,14 @@ namespace armarx::objpose
{
objpose::ObjectPoseSeq
- filterObjects(objpose::ObjectPoseSeq objects, const std::vector<std::string>& datasetBlacklist)
+ filterObjects(objpose::ObjectPoseSeq objects, const std::vector<std::string>& datasetBlocklist)
{
- const auto isBlacklisted = [&datasetBlacklist](const objpose::ObjectPose& objectPose)
+ const auto isBlacklisted = [&datasetBlocklist](const objpose::ObjectPose& objectPose)
{
const auto dataset = objectPose.objectID.dataset();
- return std::find(datasetBlacklist.begin(), datasetBlacklist.end(), dataset) !=
- datasetBlacklist.end();
+ return std::find(datasetBlocklist.begin(), datasetBlocklist.end(), dataset) !=
+ datasetBlocklist.end();
};
objects.erase(std::remove_if(objects.begin(), objects.end(), isBlacklisted), objects.end());
diff --git a/source/RobotAPI/libraries/ArmarXObjects/util.h b/source/RobotAPI/libraries/ArmarXObjects/util.h
index 9c54736b0..bd8ebf0c8 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/util.h
+++ b/source/RobotAPI/libraries/ArmarXObjects/util.h
@@ -28,7 +28,7 @@
namespace armarx::objpose
{
objpose::ObjectPoseSeq filterObjects(objpose::ObjectPoseSeq objects,
- const std::vector<std::string>& datasetBlacklist);
+ const std::vector<std::string>& datasetBlocklist);
VirtualRobot::ManipulationObjectPtr asManipulationObject(const objpose::ObjectPose& objectPose);
VirtualRobot::SceneObjectSetPtr asSceneObjects(const objpose::ObjectPoseSeq& objectPoses);
--
GitLab