From b1307a72eaf883463720d711d3c866a17fdc5b33 Mon Sep 17 00:00:00 2001
From: joanvallve <jvallve@iri.upc.edu>
Date: Wed, 30 Apr 2025 15:34:15 +0200
Subject: [PATCH] make private attributes that might be ambiguous to derived
classes
---
include/core/processor/motion_provider.h | 6 +++---
include/core/processor/processor_base.h | 4 ++--
src/processor/motion_provider.cpp | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/core/processor/motion_provider.h b/include/core/processor/motion_provider.h
index 70175fb70..a4dbb165f 100644
--- a/include/core/processor/motion_provider.h
+++ b/include/core/processor/motion_provider.h
@@ -48,11 +48,11 @@ class MotionProvider
void setOrder(unsigned int);
protected:
- TypeComposite state_types_;
- bool is_state_provider_;
- unsigned int state_provider_order_;
+ bool is_state_provider_;
+ unsigned int state_provider_order_;
private:
+ TypeComposite state_types_;
VectorComposite odometry_;
mutable std::mutex mut_odometry_;
};
diff --git a/include/core/processor/processor_base.h b/include/core/processor/processor_base.h
index 6c8b0ffa3..b9d4d205d 100644
--- a/include/core/processor/processor_base.h
+++ b/include/core/processor/processor_base.h
@@ -119,9 +119,9 @@ class ProcessorBase : public NodeBase, public std::enable_shared_from_this<Proce
YAML::Node params_;
BufferFrame buffer_frame_;
BufferCapture buffer_capture_;
+
+ private:
TypeComposite state_types_; ///< State type composite of frames created or used by this processor
-
- private:
SensorBaseWPtr sensor_ptr_;
static unsigned int processor_id_count_;
diff --git a/src/processor/motion_provider.cpp b/src/processor/motion_provider.cpp
index 05303de56..3cecb4925 100644
--- a/src/processor/motion_provider.cpp
+++ b/src/processor/motion_provider.cpp
@@ -23,9 +23,9 @@
using namespace wolf;
MotionProvider::MotionProvider(const TypeComposite& _state_types, const YAML::Node& _params)
- : state_types_(_state_types),
- is_state_provider_(_params["state_provider"].as<bool>()),
- state_provider_order_(_params["state_provider_order"] ? _params["state_provider_order"].as<unsigned int>() : 0)
+ : is_state_provider_(_params["state_provider"].as<bool>()),
+ state_provider_order_(_params["state_provider_order"] ? _params["state_provider_order"].as<unsigned int>() : 0),
+ state_types_(_state_types)
{
checkTypeComposite(_state_types);
--
GitLab