From: sfan5 <sfan5@live.de>
Date: Thu, 28 Apr 2022 19:16:10 +0000 (+0200)
Subject: Sort out two -Wdeprecated-copy warnings
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;ds=sidebyside;h=c9b66c8c5883978825e4aca0c7410a2c3e9c0351;p=irrlicht.git

Sort out two -Wdeprecated-copy warnings

- SMaterial copy constructor is removed entirely
  (same change in upstream trunk r6362)
- CMatrix4 gets an explicit, but default copy constructor readded
---

diff --git a/include/SMaterial.h b/include/SMaterial.h
index 55be84a..43dadb6 100644
--- a/include/SMaterial.h
+++ b/include/SMaterial.h
@@ -301,16 +301,6 @@ namespace video
 			FogEnable(false), NormalizeNormals(false), UseMipMaps(true)
 		{ }
 
-		//! Copy constructor
-		/** \param other Material to copy from. */
-		SMaterial(const SMaterial& other)
-		{
-			// These pointers are checked during assignment
-			for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
-				TextureLayer[i].TextureMatrix = 0;
-			*this = other;
-		}
-
 		//! Texture layer array.
 		SMaterialLayer TextureLayer[MATERIAL_MAX_TEXTURES];
 
diff --git a/include/matrix4.h b/include/matrix4.h
index cd03c44..c410973 100644
--- a/include/matrix4.h
+++ b/include/matrix4.h
@@ -102,6 +102,9 @@ namespace core
 			//! Simple operator for linearly accessing every element of the matrix.
 			const T& operator[](u32 index) const { return M[index]; }
 
+			//! Sets this matrix equal to the other matrix.
+			CMatrix4<T>& operator=(const CMatrix4<T> &other) = default;
+
 			//! Sets all elements of this matrix to the value.
 			inline CMatrix4<T>& operator=(const T& scalar);