From 7c4b38428039673b79eb5ca058c707c6645ebff9 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 22 Aug 2016 13:28:56 +0200
Subject: filter/accela: fix MSVC ODR bug

---
 filter-accela/ftnoir_filter_accela.cpp | 4 ++--
 filter-accela/ftnoir_filter_accela.h   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/filter-accela/ftnoir_filter_accela.cpp b/filter-accela/ftnoir_filter_accela.cpp
index a5127cb3..7f79bafa 100644
--- a/filter-accela/ftnoir_filter_accela.cpp
+++ b/filter-accela/ftnoir_filter_accela.cpp
@@ -17,8 +17,8 @@ constexpr double settings_accela::mult_rot_dz;
 constexpr double settings_accela::mult_trans_dz;
 constexpr double settings_accela::mult_ewma;
 
-constexpr double settings_accela::rot_gains[][2];
-constexpr double settings_accela::trans_gains[][2];
+constexpr double settings_accela::rot_gains[16][2];
+constexpr double settings_accela::trans_gains[16][2];
 
 FTNoIR_Filter::FTNoIR_Filter() : first_run(true)
 {
diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h
index fb2d78b2..b6bd81e6 100644
--- a/filter-accela/ftnoir_filter_accela.h
+++ b/filter-accela/ftnoir_filter_accela.h
@@ -18,7 +18,8 @@ using namespace options;
 
 struct settings_accela : opts
 {
-    static constexpr double rot_gains[][2] = {
+    static constexpr double rot_gains[16][2] =
+    {
         { 6, 200 },
         { 2.66, 50 },
         { 1.66, 17 },
@@ -28,7 +29,8 @@ struct settings_accela : opts
         { -1, 0 }
     };
 
-    static constexpr double trans_gains[][2] = {
+    static constexpr double trans_gains[16][2] =
+    {
         { 2.33, 40 },
         { 1.66, 13 },
         { 1.33, 5 },
-- 
cgit v1.2.3