From 4e8df9dcc82ab4785f918d5191c27eaf6b68be36 Mon Sep 17 00:00:00 2001 From: Erik Hofman Date: Wed, 4 Jul 2018 09:33:32 +0200 Subject: [PATCH] Remove a bunch og gcc-8 warnings --- simgear/math/SGMatrix.hxx | 4 ++-- simgear/math/SGVec2.hxx | 4 ++-- simgear/math/SGVec3.hxx | 4 ++-- simgear/math/SGVec4.hxx | 4 ++-- simgear/math/simd.hxx | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/simgear/math/SGMatrix.hxx b/simgear/math/SGMatrix.hxx index 3792185d..a1d5690b 100644 --- a/simgear/math/SGMatrix.hxx +++ b/simgear/math/SGMatrix.hxx @@ -142,10 +142,10 @@ public: T (&sg(void))[4][4] { return _data.ptr(); } /// Readonly raw storage interface - const simd4x4_t (&simd4x4(void) const) + const simd4x4_t &simd4x4(void) const { return _data; } /// Readonly raw storage interface - simd4x4_t (&simd4x4(void)) + simd4x4_t &simd4x4(void) { return _data; } diff --git a/simgear/math/SGVec2.hxx b/simgear/math/SGVec2.hxx index 21746a39..93655cb1 100644 --- a/simgear/math/SGVec2.hxx +++ b/simgear/math/SGVec2.hxx @@ -87,10 +87,10 @@ public: /// Access raw data T (&data(void))[2] { return _data.ptr(); } - const simd4_t (&simd2(void) const) + const simd4_t &simd2(void) const { return _data; } /// Readonly raw storage interface - simd4_t (&simd2(void)) + simd4_t &simd2(void) { return _data; } /// Inplace addition diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx index 720a13a0..514f9575 100644 --- a/simgear/math/SGVec3.hxx +++ b/simgear/math/SGVec3.hxx @@ -106,10 +106,10 @@ public: T (&data(void))[3] { return _data.ptr(); } /// Readonly raw storage interface - const simd4_t (&simd3(void) const) + const simd4_t &simd3(void) const { return _data; } /// Readonly raw storage interface - simd4_t (&simd3(void)) + simd4_t &simd3(void) { return _data; } /// Inplace addition diff --git a/simgear/math/SGVec4.hxx b/simgear/math/SGVec4.hxx index 24cef2bb..b62561ab 100644 --- a/simgear/math/SGVec4.hxx +++ b/simgear/math/SGVec4.hxx @@ -99,10 +99,10 @@ public: T (&data(void))[4] { return _data.ptr(); } /// Readonly raw storage interface - const simd4_t (&simd4(void) const) + const simd4_t &simd4(void) const { return _data; } /// Readonly raw storage interface - simd4_t (&simd4(void)) + simd4_t &simd4(void) { return _data; } /// Inplace addition diff --git a/simgear/math/simd.hxx b/simgear/math/simd.hxx index dd584732..a2847775 100644 --- a/simgear/math/simd.hxx +++ b/simgear/math/simd.hxx @@ -352,10 +352,10 @@ public: simd4_t(const simd4_t& v) { simd4 = v.v4(); } simd4_t(const __m128& v) { simd4 = v; } - inline const __m128 (&v4(void) const) { + inline const __m128 &v4(void) const { return simd4; } - inline __m128 (&v4(void)) { + inline __m128 &v4(void) { return simd4; } @@ -1120,11 +1120,11 @@ public: simd4_t(const simd4_t& v) { simd4 = v.v4(); } simd4_t(const __m128i& v) { simd4 = v; } - inline __m128i (&v4(void)) { + inline __m128i &v4(void) { return simd4; } - inline const __m128i (&v4(void) const) { + inline const __m128i &v4(void) const { return simd4; }