From 01c0507f471bbd69d7409b68c2e7c7d1912901ad Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Fri, 15 Feb 2019 18:54:17 +0100
Subject: [PATCH] Remove implicit conversion volatile for volatile += operators
---
src/algebra/TinyMatrix.hpp | 3 +--
src/algebra/TinyVector.hpp | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/algebra/TinyMatrix.hpp b/src/algebra/TinyMatrix.hpp
index bafd84bdc..9fd69705b 100644
--- a/src/algebra/TinyMatrix.hpp
+++ b/src/algebra/TinyMatrix.hpp
@@ -174,12 +174,11 @@ public:
}
PASTIS_INLINE
- constexpr volatile TinyMatrix& operator+=(const volatile TinyMatrix& A) volatile
+ constexpr void operator+=(const volatile TinyMatrix& A) volatile
{
for (size_t i=0; i<N*N; ++i) {
m_values[i] += A.m_values[i];
}
- return *this;
}
PASTIS_INLINE
diff --git a/src/algebra/TinyVector.hpp b/src/algebra/TinyVector.hpp
index 417d26fad..6d833e6b3 100644
--- a/src/algebra/TinyVector.hpp
+++ b/src/algebra/TinyVector.hpp
@@ -151,12 +151,11 @@ class TinyVector
}
PASTIS_INLINE
- constexpr volatile TinyVector& operator+=(const volatile TinyVector& v) volatile
+ constexpr void operator+=(const volatile TinyVector& v) volatile
{
for (size_t i=0; i<N; ++i) {
m_values[i] += v.m_values[i];
}
- return *this;
}
PASTIS_INLINE
--
GitLab