Ver código fonte

Fix new GCC 9 warnings: -Wdeprecated-copy.

(cherry picked from commit 6be77da7eb817fc1f8469bd0bdd8a0d08167e701)
marxin 6 anos atrás
pai
commit
c33a924c28

+ 6 - 0
core/math/audio_frame.h

@@ -122,6 +122,12 @@ struct AudioFrame {
 		r = p_frame.r;
 	}
 
+	_ALWAYS_INLINE_ AudioFrame operator=(const AudioFrame &p_frame) {
+		l = p_frame.l;
+		r = p_frame.r;
+		return *this;
+	}
+
 	_ALWAYS_INLINE_ AudioFrame() {}
 };
 

+ 8 - 0
core/math/quat.h

@@ -131,6 +131,14 @@ public:
 			w(q.w) {
 	}
 
+	Quat operator=(const Quat &q) {
+		x = q.x;
+		y = q.y;
+		z = q.z;
+		w = q.w;
+		return *this;
+	}
+
 	Quat(const Vector3 &v0, const Vector3 &v1) // shortest arc
 	{
 		Vector3 c = v0.cross(v1);

+ 8 - 0
core/ustring.h

@@ -97,6 +97,10 @@ public:
 
 	_FORCE_INLINE_ CharString() {}
 	_FORCE_INLINE_ CharString(const CharString &p_str) { _cowdata._ref(p_str._cowdata); }
+	_FORCE_INLINE_ CharString operator=(const CharString &p_str) {
+		_cowdata._ref(p_str._cowdata);
+		return *this;
+	}
 
 	bool operator<(const CharString &p_right) const;
 	CharString &operator+=(char p_char);
@@ -339,6 +343,10 @@ public:
 
 	_FORCE_INLINE_ String() {}
 	_FORCE_INLINE_ String(const String &p_str) { _cowdata._ref(p_str._cowdata); }
+	String operator=(const String &p_str) {
+		_cowdata._ref(p_str._cowdata);
+		return *this;
+	}
 
 	String(const char *p_str);
 	String(const CharType *p_str, int p_clip_to_len = -1);

+ 8 - 0
scene/3d/soft_body.cpp

@@ -104,6 +104,14 @@ SoftBody::PinnedPoint::PinnedPoint(const PinnedPoint &obj_tocopy) {
 	offset = obj_tocopy.offset;
 }
 
+SoftBody::PinnedPoint SoftBody::PinnedPoint::operator=(const PinnedPoint &obj) {
+	point_index = obj.point_index;
+	spatial_attachment_path = obj.spatial_attachment_path;
+	spatial_attachment = obj.spatial_attachment;
+	offset = obj.offset;
+	return *this;
+}
+
 void SoftBody::_update_pickable() {
 	if (!is_inside_tree())
 		return;

+ 1 - 0
scene/3d/soft_body.h

@@ -75,6 +75,7 @@ public:
 
 		PinnedPoint();
 		PinnedPoint(const PinnedPoint &obj_tocopy);
+		PinnedPoint operator=(const PinnedPoint &obj);
 	};
 
 private:

+ 6 - 0
servers/physics_2d_server.h

@@ -653,6 +653,12 @@ class Physics2DServerManager {
 		ClassInfo(const ClassInfo &p_ci) :
 				name(p_ci.name),
 				create_callback(p_ci.create_callback) {}
+
+		ClassInfo operator=(const ClassInfo &p_ci) {
+			name = p_ci.name;
+			create_callback = p_ci.create_callback;
+			return *this;
+		}
 	};
 
 	static Vector<ClassInfo> physics_2d_servers;

+ 6 - 0
servers/physics_server.h

@@ -794,6 +794,12 @@ class PhysicsServerManager {
 		ClassInfo(const ClassInfo &p_ci) :
 				name(p_ci.name),
 				create_callback(p_ci.create_callback) {}
+
+		ClassInfo operator=(const ClassInfo &p_ci) {
+			name = p_ci.name;
+			create_callback = p_ci.create_callback;
+			return *this;
+		}
 	};
 
 	static Vector<ClassInfo> physics_servers;