From cb8cd25b28f85c59d9690add7e6890b88fa44015 Mon Sep 17 00:00:00 2001 From: Ankur Roy Chowdhury Date: Mon, 6 Mar 2023 15:21:11 -0800 Subject: [PATCH] Get rid of 'shadow-field' errors/warnings --- gtsam/navigation/PreintegrationCombinedParams.h | 4 ++-- gtsam/navigation/PreintegrationParams.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtsam/navigation/PreintegrationCombinedParams.h b/gtsam/navigation/PreintegrationCombinedParams.h index 30441ec36..151f554f7 100644 --- a/gtsam/navigation/PreintegrationCombinedParams.h +++ b/gtsam/navigation/PreintegrationCombinedParams.h @@ -51,8 +51,8 @@ struct GTSAM_EXPORT PreintegrationCombinedParams : PreintegrationParams { /// See two named constructors below for good values of n_gravity in body /// frame - PreintegrationCombinedParams(const Vector3& n_gravity) - : PreintegrationParams(n_gravity), + PreintegrationCombinedParams(const Vector3& n_gravity_) + : PreintegrationParams(n_gravity_), biasAccCovariance(I_3x3), biasOmegaCovariance(I_3x3), biasAccOmegaInt(I_6x6) {} diff --git a/gtsam/navigation/PreintegrationParams.h b/gtsam/navigation/PreintegrationParams.h index 4350c7ebd..8435d0bad 100644 --- a/gtsam/navigation/PreintegrationParams.h +++ b/gtsam/navigation/PreintegrationParams.h @@ -40,12 +40,12 @@ struct GTSAM_EXPORT PreintegrationParams: PreintegratedRotationParams { /// The Params constructor insists on getting the navigation frame gravity vector /// For convenience, two commonly used conventions are provided by named constructors below - PreintegrationParams(const Vector3& n_gravity) + PreintegrationParams(const Vector3& n_gravity_) : PreintegratedRotationParams(), accelerometerCovariance(I_3x3), integrationCovariance(I_3x3), use2ndOrderCoriolis(false), - n_gravity(n_gravity) {} + n_gravity(n_gravity_) {} // Default Params for a Z-down navigation frame, such as NED: gravity points along positive Z-axis static std::shared_ptr MakeSharedD(double g = 9.81) {