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

[dreammaster]

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:
bf6460de96 TITANIC: Fix Clang warning


Commit: bf6460de96f15642860c202f75e0cb77ff9cc345
    https://github.com/scummvm/scummvm/commit/bf6460de96f15642860c202f75e0cb77ff9cc345
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-03-14T21:29:02-07:00

Commit Message:
TITANIC: Fix Clang warning

warning: definition of implicit copy assignment operator for 'X' is deprecated because it has a user-declared copy constructor

Changed paths:
    engines/titanic/star_control/fmatrix.cpp
    engines/titanic/star_control/fmatrix.h
    engines/titanic/star_control/fpose.cpp
    engines/titanic/star_control/fpose.h


diff --git a/engines/titanic/star_control/fmatrix.cpp b/engines/titanic/star_control/fmatrix.cpp
index 4a2183c5eb..4b259e2bbd 100644
--- a/engines/titanic/star_control/fmatrix.cpp
+++ b/engines/titanic/star_control/fmatrix.cpp
@@ -51,12 +51,6 @@ FMatrix::FMatrix(const FVector &row1, const FVector &row2, const FVector &row3)
 	_row3 = row3;
 }
 
-FMatrix::FMatrix(const FMatrix &src) {
-	_row1 = src._row1;
-	_row2 = src._row2;
-	_row3 = src._row3;
-}
-
 void FMatrix::load(SimpleFile *file, int param) {
 	_row1._x = file->readFloat();
 	_row1._y = file->readFloat();
diff --git a/engines/titanic/star_control/fmatrix.h b/engines/titanic/star_control/fmatrix.h
index c5bf3ed9e3..284ec54921 100644
--- a/engines/titanic/star_control/fmatrix.h
+++ b/engines/titanic/star_control/fmatrix.h
@@ -41,7 +41,6 @@ public:
 public:
 	FMatrix();
 	FMatrix(const FVector &, const FVector &, const FVector &);
-	FMatrix(const FMatrix &src);
 
 	/**
 	 * Load the data for the class from file
diff --git a/engines/titanic/star_control/fpose.cpp b/engines/titanic/star_control/fpose.cpp
index 5e98344b69..240aea591f 100644
--- a/engines/titanic/star_control/fpose.cpp
+++ b/engines/titanic/star_control/fpose.cpp
@@ -55,10 +55,6 @@ FPose::FPose(Axis axis, float amount) {
 	setRotationMatrix(axis, amount);
 }
 
-FPose::FPose(const FPose &src) : FMatrix() {
-	copyFrom(src);
-}
-
 FPose::FPose(const FPose &s1, const FPose &s2) {
 	fposeProd(s1, s2, *this);
 }
diff --git a/engines/titanic/star_control/fpose.h b/engines/titanic/star_control/fpose.h
index d2a6923184..adf68cec18 100644
--- a/engines/titanic/star_control/fpose.h
+++ b/engines/titanic/star_control/fpose.h
@@ -38,7 +38,6 @@ public:
 public:
 	FPose();
 	FPose(Axis axis, float amount);
-	FPose(const FPose &src);
 	FPose(int mode, const FVector &src);
 	/**
 	 * This fpose is the fpose product of s1 (on the left) and s2 (on the right)