From cd0034d99d1991bae4d89f2cea923c58d924765d Mon Sep 17 00:00:00 2001
From: Fabian Paus <fabian.paus@kit.edu>
Date: Thu, 21 May 2020 10:08:23 +0200
Subject: [PATCH] Use std instead of boost (Requires ArmarXCore update)
---
.../libraries/core/observerfilters/MatrixFilters.h | 12 ++++++------
.../observerfilters/MedianDerivativeFilterV3.cpp | 2 +-
.../libraries/core/observerfilters/OffsetFilter.h | 4 ++--
.../core/observerfilters/PoseAverageFilter.cpp | 2 +-
.../core/observerfilters/PoseMedianFilter.h | 2 +-
.../core/observerfilters/PoseMedianOffsetFilter.cpp | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h b/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
index cdb7046db..2e3306261 100644
--- a/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
+++ b/source/RobotAPI/libraries/core/observerfilters/MatrixFilters.h
@@ -42,7 +42,7 @@ namespace armarx::filters
VariantBasePtr calculate(const Ice::Current&) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
@@ -73,7 +73,7 @@ namespace armarx::filters
VariantBasePtr calculate(const Ice::Current&) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
@@ -104,7 +104,7 @@ namespace armarx::filters
VariantBasePtr calculate(const Ice::Current&) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
@@ -140,7 +140,7 @@ namespace armarx::filters
VariantBasePtr calculate(const Ice::Current&) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
@@ -199,7 +199,7 @@ namespace armarx::filters
VariantBasePtr calculate(const Ice::Current&) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
@@ -248,7 +248,7 @@ namespace armarx::filters
}
VariantBasePtr calculate(const Ice::Current&) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
diff --git a/source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.cpp b/source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.cpp
index 42c89f07e..eaf211478 100644
--- a/source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.cpp
+++ b/source/RobotAPI/libraries/core/observerfilters/MedianDerivativeFilterV3.cpp
@@ -39,7 +39,7 @@ armarx::filters::MedianDerivativeFilterV3::MedianDerivativeFilterV3(std::size_t
armarx::VariantBasePtr armarx::filters::MedianDerivativeFilterV3::calculate(const Ice::Current& c) const
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
diff --git a/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h b/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
index d161d4ca3..68b2cc809 100644
--- a/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
+++ b/source/RobotAPI/libraries/core/observerfilters/OffsetFilter.h
@@ -55,7 +55,7 @@ namespace armarx::filters
VariantBasePtr calculate(const Ice::Current& c = Ice::emptyCurrent) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
VariantPtr newVariant;
@@ -135,7 +135,7 @@ namespace armarx::filters
if (firstRun)
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
diff --git a/source/RobotAPI/libraries/core/observerfilters/PoseAverageFilter.cpp b/source/RobotAPI/libraries/core/observerfilters/PoseAverageFilter.cpp
index 5b0cf4dbe..aa3b14347 100644
--- a/source/RobotAPI/libraries/core/observerfilters/PoseAverageFilter.cpp
+++ b/source/RobotAPI/libraries/core/observerfilters/PoseAverageFilter.cpp
@@ -28,7 +28,7 @@ namespace armarx::filters
VariantBasePtr PoseAverageFilter::calculate(const Ice::Current& c) const
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
diff --git a/source/RobotAPI/libraries/core/observerfilters/PoseMedianFilter.h b/source/RobotAPI/libraries/core/observerfilters/PoseMedianFilter.h
index 8b43dd548..33bbed178 100644
--- a/source/RobotAPI/libraries/core/observerfilters/PoseMedianFilter.h
+++ b/source/RobotAPI/libraries/core/observerfilters/PoseMedianFilter.h
@@ -50,7 +50,7 @@ namespace armarx::filters
public:
VariantBasePtr calculate(const Ice::Current& c) const override
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
diff --git a/source/RobotAPI/libraries/core/observerfilters/PoseMedianOffsetFilter.cpp b/source/RobotAPI/libraries/core/observerfilters/PoseMedianOffsetFilter.cpp
index 42bdc1c19..e4d4a1444 100644
--- a/source/RobotAPI/libraries/core/observerfilters/PoseMedianOffsetFilter.cpp
+++ b/source/RobotAPI/libraries/core/observerfilters/PoseMedianOffsetFilter.cpp
@@ -37,7 +37,7 @@ armarx::filters::PoseMedianOffsetFilter::PoseMedianOffsetFilter(int windowSize)
armarx::VariantBasePtr armarx::filters::PoseMedianOffsetFilter::calculate(const Ice::Current& c) const
{
- ScopedLock lock(historyMutex);
+ std::unique_lock lock(historyMutex);
if (dataHistory.size() == 0)
{
--
GitLab