mirror of
https://github.com/minetest/irrlicht.git
synced 2024-12-25 23:47:30 +01:00
Remove several copy-constructors and assignment operators which did nothing special.
They all just implemented the same the default functions do. This causes now warnings with newer gcc -Wdeprecated settings (otherwise they would have had to implement always both, but makes no sense as they did nothing special). git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6280 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
parent
1e7ceac26c
commit
b11c4c142c
@ -639,12 +639,6 @@ namespace quake3
|
|||||||
: ID ( 0 ), VarGroup ( 0 ) {}
|
: ID ( 0 ), VarGroup ( 0 ) {}
|
||||||
virtual ~IShader () {}
|
virtual ~IShader () {}
|
||||||
|
|
||||||
void operator = (const IShader &other )
|
|
||||||
{
|
|
||||||
ID = other.ID;
|
|
||||||
VarGroup = other.VarGroup;
|
|
||||||
name = other.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator == (const IShader &other ) const
|
bool operator == (const IShader &other ) const
|
||||||
{
|
{
|
||||||
|
@ -47,9 +47,6 @@ namespace scene
|
|||||||
//! Default Constructor
|
//! Default Constructor
|
||||||
SViewFrustum() : BoundingRadius(0.f), FarNearDistance(0.f) {}
|
SViewFrustum() : BoundingRadius(0.f), FarNearDistance(0.f) {}
|
||||||
|
|
||||||
//! Copy Constructor
|
|
||||||
SViewFrustum(const SViewFrustum& other);
|
|
||||||
|
|
||||||
//! This constructor creates a view frustum based on a projection and/or view matrix.
|
//! This constructor creates a view frustum based on a projection and/or view matrix.
|
||||||
//\param zClipFromZero: Clipping of z can be projected from 0 to w when true (D3D style) and from -w to w when false (OGL style).
|
//\param zClipFromZero: Clipping of z can be projected from 0 to w when true (D3D style) and from -w to w when false (OGL style).
|
||||||
SViewFrustum(const core::matrix4& mat, bool zClipFromZero);
|
SViewFrustum(const core::matrix4& mat, bool zClipFromZero);
|
||||||
@ -140,27 +137,6 @@ namespace scene
|
|||||||
core::vector3df BoundingCenter;
|
core::vector3df BoundingCenter;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
/*!
|
|
||||||
Copy constructor ViewFrustum
|
|
||||||
*/
|
|
||||||
inline SViewFrustum::SViewFrustum(const SViewFrustum& other)
|
|
||||||
{
|
|
||||||
cameraPosition=other.cameraPosition;
|
|
||||||
boundingBox=other.boundingBox;
|
|
||||||
|
|
||||||
u32 i;
|
|
||||||
for (i=0; i<VF_PLANE_COUNT; ++i)
|
|
||||||
planes[i]=other.planes[i];
|
|
||||||
|
|
||||||
for (i=0; i<ETS_COUNT_FRUSTUM; ++i)
|
|
||||||
Matrices[i]=other.Matrices[i];
|
|
||||||
|
|
||||||
BoundingRadius = other.BoundingRadius;
|
|
||||||
FarNearDistance = other.FarNearDistance;
|
|
||||||
BoundingCenter = other.BoundingCenter;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline SViewFrustum::SViewFrustum(const core::matrix4& mat, bool zClipFromZero)
|
inline SViewFrustum::SViewFrustum(const core::matrix4& mat, bool zClipFromZero)
|
||||||
{
|
{
|
||||||
setFrom(mat, zClipFromZero);
|
setFrom(mat, zClipFromZero);
|
||||||
|
@ -453,13 +453,6 @@ class map
|
|||||||
return Cur;
|
return Cur;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParentFirstIterator& operator=(const ParentFirstIterator& src)
|
|
||||||
{
|
|
||||||
Root = src.Root;
|
|
||||||
Cur = src.Cur;
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator++(int)
|
void operator++(int)
|
||||||
{
|
{
|
||||||
inc();
|
inc();
|
||||||
@ -552,13 +545,6 @@ class map
|
|||||||
return Cur;
|
return Cur;
|
||||||
}
|
}
|
||||||
|
|
||||||
ParentLastIterator& operator=(const ParentLastIterator& src)
|
|
||||||
{
|
|
||||||
Root = src.Root;
|
|
||||||
Cur = src.Cur;
|
|
||||||
return (*this);
|
|
||||||
}
|
|
||||||
|
|
||||||
void operator++(int)
|
void operator++(int)
|
||||||
{
|
{
|
||||||
inc();
|
inc();
|
||||||
|
@ -24,8 +24,6 @@ class line2d
|
|||||||
line2d(T xa, T ya, T xb, T yb) : start(xa, ya), end(xb, yb) {}
|
line2d(T xa, T ya, T xb, T yb) : start(xa, ya), end(xb, yb) {}
|
||||||
//! Constructor for line between the two points given as vectors.
|
//! Constructor for line between the two points given as vectors.
|
||||||
line2d(const vector2d<T>& start, const vector2d<T>& end) : start(start), end(end) {}
|
line2d(const vector2d<T>& start, const vector2d<T>& end) : start(start), end(end) {}
|
||||||
//! Copy constructor.
|
|
||||||
line2d(const line2d<T>& other) : start(other.start), end(other.end) {}
|
|
||||||
|
|
||||||
// operators
|
// operators
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
Tests finished. 72 tests of 72 passed.
|
Tests finished. 72 tests of 72 passed.
|
||||||
Compiled as DEBUG
|
Compiled as DEBUG
|
||||||
Test suite pass at GMT Sat Feb 13 16:24:31 2021
|
Test suite pass at GMT Thu Jan 6 13:59:44 2022
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user