Matrix.hpp: remove wrong and correct formatting changes which are not on master for clarity

This commit is contained in:
Thomas Gubler
2015-01-08 08:26:04 +01:00
parent c118d17cb5
commit 74af4807a1
+12 -9
View File
@@ -83,9 +83,10 @@ public:
* trivial ctor
* Initializes the elements to zero.
*/
MatrixBase() :
data {},
arm_mat {M, N, &data[0][0]} {
MatrixBase() :
data{},
arm_mat{M, N, &data[0][0]}
{
}
virtual ~MatrixBase() {};
@@ -94,17 +95,20 @@ public:
* copyt ctor
*/
MatrixBase(const MatrixBase<M, N> &m) :
arm_mat {M, N, &data[0][0]} {
arm_mat{M, N, &data[0][0]}
{
memcpy(data, m.data, sizeof(data));
}
MatrixBase(const float *d) :
arm_mat {M, N, &data[0][0]} {
arm_mat{M, N, &data[0][0]}
{
memcpy(data, d, sizeof(data));
}
MatrixBase(const float d[M][N]) :
arm_mat {M, N, &data[0][0]} {
MatrixBase(const float d[M][N]) :
arm_mat{M, N, &data[0][0]}
{
memcpy(data, d, sizeof(data));
}
@@ -165,9 +169,8 @@ public:
bool operator ==(const Matrix<M, N> &m) const {
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
if (data[i][j] != m.data[i][j]) {
if (data[i][j] != m.data[i][j])
return false;
}
return true;
}