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
---
 compat/correlation-calibrator.hpp | 26 +++++++++++++-------------
 compat/mutex.hpp                  |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'compat')

diff --git a/compat/correlation-calibrator.hpp b/compat/correlation-calibrator.hpp
index cc168fcd..44aee537 100644
--- a/compat/correlation-calibrator.hpp
+++ b/compat/correlation-calibrator.hpp
@@ -9,7 +9,7 @@
 
 namespace correlation_calibrator_impl {
 
-static constexpr inline double min[6] = {
+static constexpr double min[6] = {
     -50,
     -50,
     250,
@@ -19,7 +19,7 @@ static constexpr inline double min[6] = {
     -180,
 };
 
-static constexpr inline double max[6] = {
+static constexpr double max[6] = {
     50,
     50,
     250,
@@ -29,18 +29,18 @@ static constexpr inline double max[6] = {
     180,
 };
 
-static constexpr inline double yaw_spacing_in_degrees = 1.5;
-static constexpr inline double pitch_spacing_in_degrees = 1;
-static constexpr inline double roll_spacing_in_degrees = 1;
+static constexpr double yaw_spacing_in_degrees = 1.5;
+static constexpr double pitch_spacing_in_degrees = 1;
+static constexpr double roll_spacing_in_degrees = 1;
 
-static constexpr inline unsigned yaw_nbuckets   = unsigned(1+ 360./yaw_spacing_in_degrees);
-static constexpr inline unsigned pitch_nbuckets = unsigned(1+ 360./pitch_spacing_in_degrees);
-static constexpr inline unsigned roll_nbuckets  = unsigned(1+ 360./roll_spacing_in_degrees);
+static constexpr unsigned yaw_nbuckets   = unsigned(1+ 360./yaw_spacing_in_degrees);
+static constexpr unsigned pitch_nbuckets = unsigned(1+ 360./pitch_spacing_in_degrees);
+static constexpr unsigned roll_nbuckets  = unsigned(1+ 360./roll_spacing_in_degrees);
 
-static constexpr inline double translation_spacing = .25;
-static constexpr inline unsigned x_nbuckets = unsigned(1+ (max[0]-min[0])/translation_spacing);
-static constexpr inline unsigned y_nbuckets = unsigned(1+ (max[1]-min[1])/translation_spacing);
-static constexpr inline unsigned z_nbuckets = unsigned(1+ (max[2]-min[2])/translation_spacing);
+static constexpr double translation_spacing = .25;
+static constexpr unsigned x_nbuckets = unsigned(1+ (max[0]-min[0])/translation_spacing);
+static constexpr unsigned y_nbuckets = unsigned(1+ (max[1]-min[1])/translation_spacing);
+static constexpr unsigned z_nbuckets = unsigned(1+ (max[2]-min[2])/translation_spacing);
 
 using vec6 = Mat<double, 6, 1>;
 using mat66 = Mat<double, 6, 6>;
@@ -68,7 +68,7 @@ public:
     mat66 get_coefficients() const;
     unsigned sample_count() const;
 
-    static constexpr inline unsigned min_samples = 25;
+    static constexpr unsigned min_samples = 25;
 };
 
 } // ns correlation_calibrator_impl
diff --git a/compat/mutex.hpp b/compat/mutex.hpp
index e142fd0b..e4d0fee6 100644
--- a/compat/mutex.hpp
+++ b/compat/mutex.hpp
@@ -10,8 +10,8 @@ class OTR_COMPAT_EXPORT mutex
 
 public:
     using RecursionMode = QMutex::RecursionMode;
-    static constexpr inline RecursionMode Recursive = RecursionMode::Recursive;
-    static constexpr inline RecursionMode NonRecursive = RecursionMode::NonRecursive;
+    static constexpr RecursionMode Recursive = RecursionMode::Recursive;
+    static constexpr RecursionMode NonRecursive = RecursionMode::NonRecursive;
 
     mutex& operator=(const mutex& datum);
     mutex(const mutex& datum);
-- 
cgit v1.2.3