diff --git a/include/core/landmark/landmark_base.h b/include/core/landmark/landmark_base.h index ec561544efd9844aab37d30d889241cc5f929eb3..49144ad50fb89e207a3880837a34014f162feefb 100644 --- a/include/core/landmark/landmark_base.h +++ b/include/core/landmark/landmark_base.h @@ -188,8 +188,6 @@ inline void LandmarkBase::setTrackId(unsigned int _track_id) track_id_ = _track_id; } - - inline unsigned int LandmarkBase::getHits() const { return constrained_by_list_.size(); diff --git a/include/core/landmark/landmark_external.h b/include/core/landmark/landmark_external.h index a96c9bc5e261fc8ad208115cd4723ae345d6375b..ba363bfa2efec32d57c397a2986080ccc70cf9b0 100644 --- a/include/core/landmark/landmark_external.h +++ b/include/core/landmark/landmark_external.h @@ -19,7 +19,8 @@ // along with this program. If not, see <http://www.gnu.org/licenses/>. // //--------LICENSE_END-------- -#pragma once +#ifndef LANDMARK_EXTERNAL_H_ +#define LANDMARK_EXTERNAL_H_ // Wolf includes #include "core/landmark/landmark_base.h" @@ -64,24 +65,25 @@ class LandmarkExternal : public LandmarkBase int getExternalType() const; }; -void LandmarkExternal::setExternalId(const int& _external_id) +inline void LandmarkExternal::setExternalId(const int& _external_id) { external_id_ = _external_id; } -int LandmarkExternal::getExternalId() const +inline int LandmarkExternal::getExternalId() const { return external_id_; } -void LandmarkExternal::setExternalType(const int& _external_type) +inline void LandmarkExternal::setExternalType(const int& _external_type) { external_type_ = _external_type; } -int LandmarkExternal::getExternalType() const +inline int LandmarkExternal::getExternalType() const { return external_type_; } } // namespace wolf +#endif \ No newline at end of file diff --git a/include/core/processor/processor_landmark_external.h b/include/core/processor/processor_landmark_external.h index 06d0f11031cd14095941c64aeeeeffbbf5cdaaeb..ae305ab7c6a9b2c9fb7578a1ec5d53c7a938ab21 100644 --- a/include/core/processor/processor_landmark_external.h +++ b/include/core/processor/processor_landmark_external.h @@ -20,7 +20,8 @@ // //--------LICENSE_END-------- -#pragma once +#ifndef PROCESSOR_LANDMARK_EXTERNAL_H_ +#define PROCESSOR_LANDMARK_EXTERNAL_H_ #include "core/common/wolf.h" #include "core/processor/processor_tracker.h" @@ -71,7 +72,7 @@ class ProcessorLandmarkExternal : public ProcessorTracker { public: ProcessorLandmarkExternal(ParamsProcessorLandmarkExternalPtr _params_tracker_feature); - ~ProcessorLandmarkExternal() override; + ~ProcessorLandmarkExternal() override{}; // Factory method for high level API WOLF_PROCESSOR_CREATE(ProcessorLandmarkExternal, ParamsProcessorLandmarkExternal); @@ -163,9 +164,6 @@ inline ProcessorLandmarkExternal::ProcessorLandmarkExternal(ParamsProcessorLandm // } -inline ProcessorLandmarkExternal::~ProcessorLandmarkExternal() -{ - // -} } // namespace wolf +#endif \ No newline at end of file diff --git a/test/gtest_processor_landmark_external.cpp b/test/gtest_processor_landmark_external.cpp index b3278fc86bc867609f1686f6bddfbb91930887a1..77995d6a50f136c17dc305db655758b550f29ec4 100644 --- a/test/gtest_processor_landmark_external.cpp +++ b/test/gtest_processor_landmark_external.cpp @@ -487,17 +487,17 @@ TEST_F(ProcessorLandmarkExternalTest, P_2d_existing_lmks_id) // true); // bool init_landmarks // } -TEST_F(ProcessorLandmarkExternalTest, P_2d_no_lmks_id) -{ - testConfiguration(2, // int dim - false, // bool orientation - 0, // int mode - 0, // double quality_th - 1e6, // double dist_th - 2, // int track_length - 4.5 * dt, // double time_span - false); // bool init_landmarks -} +// TEST_F(ProcessorLandmarkExternalTest, P_2d_no_lmks_id) +// { +// testConfiguration(2, // int dim +// false, // bool orientation +// 0, // int mode +// 0, // double quality_th +// 1e6, // double dist_th +// 2, // int track_length +// 4.5 * dt, // double time_span +// false); // bool init_landmarks +// } // TEST_F(ProcessorLandmarkExternalTest, P_2d_no_lmks_type) // {