Merge https://github.com/opentrack/opentrack into unstable

merge from upstream

1 files changed, 9 insertions, 0 deletions

diff --git a/compat/simple-mat.hpp b/compat/simple-mat.hpp
index a909e40b..11bb191f 100644
--- a/compat/simple-mat.hpp
+++ b/compat/simple-mat.hpp
@@ -206,6 +206,11 @@ public:
     inline num operator()(unsigned j, unsigned i) const { return data[j][i]; }
     inline num& operator()(unsigned j, unsigned i) { return data[j][i]; }
 
+#ifdef __GNUG__
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wmissing-braces"
+#endif
+
     template<typename... ts, int h__ = h_, int w__ = w_,
              typename = typename std::enable_if<is_arglist_correct<num, h__, w__, ts...>::value>::type>
     Mat(const ts... xs) : data{static_cast<num>(xs)...}
@@ -213,6 +218,10 @@ public:
         static_assert(h__ == h_ && w__ == w_, "");
     }
 
+#ifdef __GNUG__
+#   pragma GCC diagnostic pop
+#endif
+
     Mat()
     {
         for (int j = 0; j < h_; j++)