From 502bb96daf147c1bb7db6a4ee5e913f7a7689c74 Mon Sep 17 00:00:00 2001
From: Joan Sola <jsola@iri.upc.edu>
Date: Wed, 21 Feb 2018 17:24:53 +0100
Subject: [PATCH] Reorder data members
---
src/processor_base.cpp | 8 +++++---
src/processor_base.h | 12 ++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/processor_base.cpp b/src/processor_base.cpp
index 2b7e9144d..a42bfab7e 100644
--- a/src/processor_base.cpp
+++ b/src/processor_base.cpp
@@ -9,10 +9,10 @@ unsigned int ProcessorBase::processor_id_count_ = 0;
ProcessorBase::ProcessorBase(const std::string& _type, const Scalar& _time_tolerance) :
NodeBase("PROCESSOR", _type),
- sensor_ptr_(),
- is_removing_(false),
processor_id_(++processor_id_count_),
- time_tolerance_(_time_tolerance)
+ time_tolerance_(_time_tolerance),
+ sensor_ptr_(),
+ is_removing_(false)
{
// WOLF_DEBUG("constructed +p" , id());
}
@@ -74,6 +74,8 @@ void ProcessorBase::remove()
}
}
+/////////////////////////////////////////////////////////////////////////////////////////
+
void KFPackBuffer::removeUpTo(const TimeStamp& _time_stamp)
{
KFPackBuffer::Iterator post = container_.upper_bound(_time_stamp);
diff --git a/src/processor_base.h b/src/processor_base.h
index 447f7fabe..03b811b61 100644
--- a/src/processor_base.h
+++ b/src/processor_base.h
@@ -33,6 +33,7 @@ class KFPack
WOLF_PTR_TYPEDEFS(KFPack);
+
/** \brief Buffer of Key frame class objects
*
* Object and functions to manage a buffer of KFPack objects.
@@ -112,6 +113,11 @@ struct ProcessorParamsBase
//class ProcessorBase
class ProcessorBase : public NodeBase, public std::enable_shared_from_this<ProcessorBase>
{
+ protected:
+ unsigned int processor_id_;
+ Scalar time_tolerance_; ///< self time tolerance for adding a capture into a frame
+ KFPackBuffer kf_pack_buffer_;
+
private:
SensorBaseWPtr sensor_ptr_;
@@ -168,12 +174,6 @@ class ProcessorBase : public NodeBase, public std::enable_shared_from_this<Proce
void setTimeTolerance(Scalar _time_tolerance);
- protected:
- unsigned int processor_id_;
-
- Scalar time_tolerance_; ///< self time tolerance for adding a capture into a frame
-
- KFPackBuffer kf_pack_buffer_;
};
}
--
GitLab