diff --git a/include/core/capture/capture_motion.h b/include/core/capture/capture_motion.h index 95d2b8d5c945d4a16a555dbea78491f8bbfef8e5..3af1069eed05a7cd1f35123d5b5d915118d97112 100644 --- a/include/core/capture/capture_motion.h +++ b/include/core/capture/capture_motion.h @@ -106,7 +106,7 @@ class CaptureMotion : public CaptureBase Eigen::MatrixXs data_cov_; ///< Motion data covariance Eigen::VectorXs calib_preint_; ///< Calibration parameters used during pre-integration MotionBuffer buffer_; ///< Buffer of motions between this Capture and the next one. - CaptureBaseWPtr origin_capture_; ///< Pointer to the origin capture of the motion + CaptureBaseWPtr origin_capture_ptr_; ///< Pointer to the origin capture of the motion }; inline const Eigen::VectorXs& CaptureMotion::getData() const @@ -160,12 +160,12 @@ inline Eigen::VectorXs CaptureMotion::correctDelta(const VectorXs& _delta, const inline wolf::CaptureBasePtr CaptureMotion::getOriginCapture() { - return origin_capture_.lock(); + return origin_capture_ptr_.lock(); } inline void CaptureMotion::setOriginCapture(CaptureBasePtr _origin_capture) { - origin_capture_ = _origin_capture; + origin_capture_ptr_ = _origin_capture; } inline VectorXs CaptureMotion::getCalibrationPreint() const diff --git a/src/capture/capture_motion.cpp b/src/capture/capture_motion.cpp index 5368ec129689df654443d5439149522755f5ab9f..551175b953642b60808ac19eb2366891fff846c4 100644 --- a/src/capture/capture_motion.cpp +++ b/src/capture/capture_motion.cpp @@ -21,7 +21,7 @@ CaptureMotion::CaptureMotion(const std::string & _type, data_(_data), data_cov_(_sensor_ptr ? _sensor_ptr->getNoiseCov() : Eigen::MatrixXs::Zero(_data.rows(), _data.rows())), // Someone should test this zero and do something smart accordingly buffer_(), - origin_capture_(_origin_capture) + origin_capture_ptr_(_origin_capture) { // } @@ -41,7 +41,7 @@ CaptureMotion::CaptureMotion(const std::string & _type, data_(_data), data_cov_(_data_cov), buffer_(), - origin_capture_(_origin_capture) + origin_capture_ptr_(_origin_capture) { // }