edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1796

Browse source 
1796: Fix -Wdeprecated-copy from GCC9 r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
This commit is contained in:
bors[bot] 2019-06-26 09:59:40 +00:00
parent 6d19963933 b90dd43118
commit c7435fd132
4 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/base/tl/range.h
View file

@ -138,11 +138,6 @@ public:
end = 0x0;
}
plain_range(const plain_range &r)
{
*this = r;
}
plain_range(T *b, T *e)
{
begin = b;
@ -184,12 +179,6 @@ public:
plain_range_sorted()
{}
plain_range_sorted(const plain_range_sorted &r)
: parent()
{
*this = r;
}
plain_range_sorted(T *b, T *e)
: parent(b, e)
{}

6
src/base/vmath.h
View file

@ -29,8 +29,6 @@ public:
vector2_base operator /(const T v) const { return vector2_base(x/v, y/v); }
vector2_base operator /(const vector2_base &v) const { return vector2_base(x/v.x, y/v.y); }
const vector2_base &operator =(const vector2_base &v) { x = v.x; y = v.y; return *this; }
const vector2_base &operator +=(const vector2_base &v) { x += v.x; y += v.y; return *this; }
const vector2_base &operator -=(const vector2_base &v) { x -= v.x; y -= v.y; return *this; }
const vector2_base &operator *=(const T v) { x *= v; y *= v; return *this; }
@ -108,8 +106,6 @@ public:
z = nz;
}
const vector3_base &operator =(const vector3_base &v) { x = v.x; y = v.y; z = v.z; return *this; }
vector3_base operator -(const vector3_base &v) const { return vector3_base(x-v.x, y-v.y, z-v.z); }
vector3_base operator -() const { return vector3_base(-x, -y, -z); }
vector3_base operator +(const vector3_base &v) const { return vector3_base(x+v.x, y+v.y, z+v.z); }
@ -196,8 +192,6 @@ public:
vector4_base operator /(const vector4_base &v) const { return vector4_base(x/v.x, y/v.y, z/v.z, w/v.w); }
vector4_base operator /(const T v) const { return vector4_base(x/v, y/v, z/v, w/v); }
const vector4_base &operator =(const vector4_base &v) { x = v.x; y = v.y; z = v.z; w = v.w; return *this; }
const vector4_base &operator +=(const vector4_base &v) { x += v.x; y += v.y; z += v.z; w += v.w; return *this; }
const vector4_base &operator -=(const vector4_base &v) { x -= v.x; y -= v.y; z -= v.z; w -= v.w; return *this; }
const vector4_base &operator *=(const T v) { x *= v; y *= v; z *= v; w *= v; return *this; }

21
src/game/editor/editor.cpp
View file

@ -134,27 +134,6 @@ CLayerGroup::CLayerGroup()
m_ClipH = 0;
}
CLayerGroup::CLayerGroup(const CLayerGroup& rhs)
{
str_copy(m_aName, rhs.m_aName, sizeof m_aName);
m_Visible = rhs.m_Visible;
m_Collapse = rhs.m_Collapse;
m_GameGroup = rhs.m_GameGroup;
m_OffsetX = rhs.m_OffsetX;
m_OffsetY = rhs.m_OffsetY;
m_ParallaxX = rhs.m_ParallaxX;
m_ParallaxY = rhs.m_ParallaxY;
m_UseClipping = rhs.m_UseClipping;
m_ClipX = rhs.m_ClipX;
m_ClipY = rhs.m_ClipY;
m_ClipW = rhs.m_ClipW;
m_ClipH = rhs.m_ClipH;
m_lLayers = rhs.m_lLayers;
m_pMap = rhs.m_pMap;
}
CLayerGroup::~CLayerGroup()
{
Clear();

1
src/game/editor/editor.h
View file

@ -193,7 +193,6 @@ public:
bool m_Collapse;
CLayerGroup();
CLayerGroup(const CLayerGroup& rhs);
~CLayerGroup();
void Convert(CUIRect *pRect);