Fix new GCC 9 warnings: -Wdeprecated-copy.

(cherry picked from commit 6be77da7eb)
This commit is contained in:
marxin 2019-03-02 13:32:29 +01:00 committed by Hein-Pieter van Braam-Stewart
parent 4be1343f3c
commit c33a924c28
7 changed files with 43 additions and 0 deletions

View File

@ -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() {}
};

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

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

View File

@ -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;

View File

@ -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;