From a9fc10438770c0219d85622cae62614531d22c86 Mon Sep 17 00:00:00 2001 From: Julian Kent Date: Fri, 22 Jan 2021 10:59:10 +0100 Subject: [PATCH] Add inline to avoid double definition errors --- src/modules/commander/lm_fit.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/commander/lm_fit.hpp b/src/modules/commander/lm_fit.hpp index be754d0882..09ee20b880 100644 --- a/src/modules/commander/lm_fit.hpp +++ b/src/modules/commander/lm_fit.hpp @@ -54,9 +54,9 @@ * * @return 0 on success, 1 on failure */ -int run_lm_sphere_fit(const float x[], const float y[], const float z[], float &_fitness, float &_sphere_lambda, - unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z, - float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z) +inline int run_lm_sphere_fit(const float x[], const float y[], const float z[], float &_fitness, float &_sphere_lambda, + unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z, + float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z) { // Run Sphere Fit using Levenberg Marquardt LSq Fit const float lma_damping = 10.f; @@ -178,9 +178,9 @@ int run_lm_sphere_fit(const float x[], const float y[], const float z[], float & } } -int run_lm_ellipsoid_fit(const float x[], const float y[], const float z[], float &_fitness, float &_sphere_lambda, - unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z, - float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z) +inline int run_lm_ellipsoid_fit(const float x[], const float y[], const float z[], float &_fitness, + float &_sphere_lambda, unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z, + float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z) { // Run Sphere Fit using Levenberg Marquardt LSq Fit const float lma_damping = 10.0f;