From 42e6b27e1afda7fcd8beddd9676ba7edb6363a34 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 14 Jan 2019 16:21:56 +0100
Subject: modernize only

- replace `static constexpr inline' with `static constexpr'.
  `inline' is implied.
- use braced initializer lists where applicable
- still missing `override' usages
---
 cv/numeric.hpp                | 4 ++--
 cv/translation-calibrator.cpp | 2 +-
 cv/translation-calibrator.hpp | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'cv')

diff --git a/cv/numeric.hpp b/cv/numeric.hpp
index 87fe7a69..ce8f7e82 100644
--- a/cv/numeric.hpp
+++ b/cv/numeric.hpp
@@ -8,8 +8,8 @@ namespace numeric_types {
 
     static_assert(std::is_floating_point_v<f>);
 
-    static constexpr inline f eps = f(1e-8);
-    static constexpr inline f pi = f(M_PI);
+    static constexpr f eps = f(1e-8);
+    static constexpr f pi = f(M_PI);
 
     template<int n> using vec = cv::Vec<f, n>;
     using vec2 = vec<2>;
diff --git a/cv/translation-calibrator.cpp b/cv/translation-calibrator.cpp
index 9ead888e..8117b1e7 100644
--- a/cv/translation-calibrator.cpp
+++ b/cv/translation-calibrator.cpp
@@ -80,7 +80,7 @@ tt TranslationCalibrator::get_estimate()
     };
 }
 
-static constexpr inline double r2d = 180/M_PI;
+static constexpr double r2d = 180/M_PI;
 
 bool TranslationCalibrator::check_bucket(const cv::Matx33d& R_CM_k)
 {
diff --git a/cv/translation-calibrator.hpp b/cv/translation-calibrator.hpp
index da052526..406edb72 100644
--- a/cv/translation-calibrator.hpp
+++ b/cv/translation-calibrator.hpp
@@ -41,8 +41,8 @@ public:
     // we're bringing in 3DOF samples but the calibrator only
     // checks yaw and pitch
 
-    static constexpr inline unsigned num_cal_axis = 3;
-    static constexpr inline unsigned num_nsample_axis = 2;
+    static constexpr unsigned num_cal_axis = 3;
+    static constexpr unsigned num_nsample_axis = 2;
 
     using cv_cal_vec = cv::Vec<float, num_cal_axis>;
     using cv_nsample_vec = cv::Vec<unsigned, num_nsample_axis>;
@@ -51,6 +51,6 @@ public:
     // get the current estimate for t_MH
     tt get_estimate();
 
-    static constexpr inline double yaw_spacing_in_degrees = 2;
-    static constexpr inline double pitch_spacing_in_degrees = 1.5;
+    static constexpr double yaw_spacing_in_degrees = 2;
+    static constexpr double pitch_spacing_in_degrees = 1.5;
 };
-- 
cgit v1.2.3