From 48b0266eb73f233fa0c031b7b9dab96f476be141 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 5 Feb 2018 11:02:45 +0100 Subject: cv/calibrator: use constexpr inline --- cv/translation-calibrator.cpp | 4 ---- cv/translation-calibrator.hpp | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/cv/translation-calibrator.cpp b/cv/translation-calibrator.cpp index aac2434f..1eb9d1fa 100644 --- a/cv/translation-calibrator.cpp +++ b/cv/translation-calibrator.cpp @@ -13,10 +13,6 @@ #include -constexpr double TranslationCalibrator::pitch_spacing_in_degrees; -constexpr double TranslationCalibrator::yaw_spacing_in_degrees; -constexpr double TranslationCalibrator::roll_spacing_in_degrees; - TranslationCalibrator::TranslationCalibrator(unsigned yaw_rdof, unsigned pitch_rdof, unsigned roll_rdof) : yaw_rdof(yaw_rdof), pitch_rdof(pitch_rdof), roll_rdof(roll_rdof) { diff --git a/cv/translation-calibrator.hpp b/cv/translation-calibrator.hpp index d908496a..c1f6d2ec 100644 --- a/cv/translation-calibrator.hpp +++ b/cv/translation-calibrator.hpp @@ -43,9 +43,9 @@ private: vec used_pitch_poses; vec used_roll_poses; - static constexpr double yaw_spacing_in_degrees = 2.5; - static constexpr double pitch_spacing_in_degrees = 1.5; - static constexpr double roll_spacing_in_degrees = 3.5; + static constexpr inline double yaw_spacing_in_degrees = 2.5; + static constexpr inline double pitch_spacing_in_degrees = 1.5; + static constexpr inline double roll_spacing_in_degrees = 3.5; unsigned yaw_rdof, pitch_rdof, roll_rdof, nsamples; }; -- cgit v1.2.3