[Scummvm-git-logs] scummvm master -> ef4cc34347d7de04f4b2c45d52835ca454dfc3db

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ef4cc34347 MATH: Fix Clang warnings on Matrix


Commit: ef4cc34347d7de04f4b2c45d52835ca454dfc3db
    https://github.com/scummvm/scummvm/commit/ef4cc34347d7de04f4b2c45d52835ca454dfc3db
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-15T14:10:31+02:00

Commit Message:
MATH: Fix Clang warnings on Matrix

../scummvm\math/matrix.h:146:2: warning: definition of implicit copy assignment operator for 'MatrixBase<4, 4>' is deprecated because it has a user-declared copy constructor [-Wdeprecated-copy]
        MatrixBase(const MatrixBase<rows, cols> &m);
        ^
../scummvm\math/squarematrix.h:37:7: note: in implicit copy assignment operator for 'Math::MatrixBase<4, 4>' first required here
class MatrixType<dim, dim> : public MatrixBase<dim, dim> {
      ^
../scummvm\math/matrix4.h:36:7: note: in implicit copy assignment operator for 'Math::MatrixType<4, 4>' first required here
class Matrix<4, 4> : public MatrixType<4, 4>, public Rotation3D<Matrix<4, 4> > {
      ^
../scummvm\engines/grim/costume/mesh_component.h:45:65: note: in implicit copy assignment operator for 'Math::Matrix<4, 4>' first required here
        void setMatrix(const Math::Matrix4 &matrix) override { _matrix = matrix; };
                                                                       ^

Changed paths:
    math/matrix.h


diff --git a/math/matrix.h b/math/matrix.h
index 0025e9f26e..6813858d8a 100644
--- a/math/matrix.h
+++ b/math/matrix.h
@@ -75,7 +75,6 @@ public:
 	 */
 	class Row {
 	public:
-		Row &operator=(const Row &r);
 		Row &operator<<(float value);
 
 	private:
@@ -144,6 +143,7 @@ protected:
 	MatrixBase();
 	MatrixBase(const float *data);
 	MatrixBase(const MatrixBase<rows, cols> &m);
+	MatrixBase &operator=(const MatrixBase<rows, cols> &m);
 
 	inline const Matrix<rows, cols> &getThis() const {
 		return *static_cast<const Matrix<rows, cols> *>(this); }
@@ -228,6 +228,11 @@ MatrixBase<rows, cols>::MatrixBase(const MatrixBase<rows, cols> &m) {
 	setData(m._values);
 }
 
+template<int rows, int cols>
+MatrixBase<rows, cols> &MatrixBase<rows, cols>::operator=(const MatrixBase<rows, cols> &m) {
+	setData(m._values);
+	return *this;
+}
 
 
 
@@ -388,15 +393,6 @@ MatrixBase<rows, cols>::Row::Row(MatrixBase<rows, cols> *m, int row) :
 
 }
 
-template<int rows, int cols>
-typename MatrixBase<rows, cols>::Row &MatrixBase<rows, cols>::Row::operator=(const Row &r) {
-	_col = r._col;
-	_row = r._row;
-	_matrix = r._matrix;
-
-	return *this;
-}
-
 template<int rows, int cols>
 typename MatrixBase<rows, cols>::Row &MatrixBase<rows, cols>::Row::operator<<(float value) {
 	assert(_col < cols);