mirror of
https://github.com/minetest/irrlicht.git
synced 2025-06-28 06:20:21 +02:00
Remove trivial copy constructors and assignment operators
Thanks @sfan5 for patch for Mintest: 4931b34625
Forum: https://irrlicht.sourceforge.io/forum/viewtopic.php?f=2&t=52819
Note - patch is not applied exaclty yet. SMaterial and matrix4 still missing (might be applied later).
Also patch was based on older Irrlicht and we removed a few already earlier this year (around r6280).
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6355 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
@ -153,13 +153,7 @@ namespace scene
|
||||
{
|
||||
virtual ~SMD3QuaternionTag()
|
||||
{
|
||||
position.X = 0.f;
|
||||
}
|
||||
|
||||
// construct copy constructor
|
||||
SMD3QuaternionTag( const SMD3QuaternionTag & copyMe )
|
||||
{
|
||||
*this = copyMe;
|
||||
position.X = 0.f; // anyone got an idea why?
|
||||
}
|
||||
|
||||
// construct for searching
|
||||
@ -181,14 +175,6 @@ namespace scene
|
||||
return Name == other.Name;
|
||||
}
|
||||
|
||||
SMD3QuaternionTag & operator=( const SMD3QuaternionTag & copyMe )
|
||||
{
|
||||
Name = copyMe.Name;
|
||||
position = copyMe.position;
|
||||
rotation = copyMe.rotation;
|
||||
return *this;
|
||||
}
|
||||
|
||||
core::stringc Name;
|
||||
core::vector3df position;
|
||||
core::quaternion rotation;
|
||||
@ -202,12 +188,6 @@ namespace scene
|
||||
Container.setAllocStrategy(core::ALLOC_STRATEGY_SAFE);
|
||||
}
|
||||
|
||||
// construct copy constructor
|
||||
SMD3QuaternionTagList(const SMD3QuaternionTagList& copyMe)
|
||||
{
|
||||
*this = copyMe;
|
||||
}
|
||||
|
||||
virtual ~SMD3QuaternionTagList() {}
|
||||
|
||||
SMD3QuaternionTag* get(const core::stringc& name)
|
||||
@ -250,12 +230,6 @@ namespace scene
|
||||
Container.push_back(other);
|
||||
}
|
||||
|
||||
SMD3QuaternionTagList& operator = (const SMD3QuaternionTagList & copyMe)
|
||||
{
|
||||
Container = copyMe.Container;
|
||||
return *this;
|
||||
}
|
||||
|
||||
private:
|
||||
core::array < SMD3QuaternionTag > Container;
|
||||
};
|
||||
|
@ -140,9 +140,6 @@ class map
|
||||
reset();
|
||||
}
|
||||
|
||||
// Copy constructor
|
||||
Iterator(const Iterator& src) : Root(src.Root), Cur(src.Cur) {}
|
||||
|
||||
void reset(bool atLowest=true)
|
||||
{
|
||||
if (atLowest)
|
||||
@ -161,13 +158,6 @@ class map
|
||||
return Cur;
|
||||
}
|
||||
|
||||
Iterator& operator=(const Iterator& src)
|
||||
{
|
||||
Root = src.Root;
|
||||
Cur = src.Cur;
|
||||
return (*this);
|
||||
}
|
||||
|
||||
void operator++(int)
|
||||
{
|
||||
inc();
|
||||
@ -287,8 +277,7 @@ class map
|
||||
reset();
|
||||
}
|
||||
|
||||
// Copy constructor
|
||||
ConstIterator(const ConstIterator& src) : Root(src.Root), Cur(src.Cur) {}
|
||||
// Constructor(Iterator)
|
||||
ConstIterator(const Iterator& src) : Root(src.Root), Cur(src.Cur) {}
|
||||
|
||||
void reset(bool atLowest=true)
|
||||
@ -309,13 +298,6 @@ class map
|
||||
return Cur;
|
||||
}
|
||||
|
||||
ConstIterator& operator=(const ConstIterator& src)
|
||||
{
|
||||
Root = src.Root;
|
||||
Cur = src.Cur;
|
||||
return (*this);
|
||||
}
|
||||
|
||||
void operator++(int)
|
||||
{
|
||||
inc();
|
||||
|
@ -27,8 +27,6 @@ public:
|
||||
vector2d(T nx, T ny) : X(nx), Y(ny) {}
|
||||
//! Constructor with the same value for both members
|
||||
explicit vector2d(T n) : X(n), Y(n) {}
|
||||
//! Copy constructor
|
||||
vector2d(const vector2d<T>& other) : X(other.X), Y(other.Y) {}
|
||||
|
||||
vector2d(const dimension2d<T>& other) : X(other.Width), Y(other.Height) {}
|
||||
|
||||
@ -36,8 +34,6 @@ public:
|
||||
|
||||
vector2d<T> operator-() const { return vector2d<T>(-X, -Y); }
|
||||
|
||||
vector2d<T>& operator=(const vector2d<T>& other) { X = other.X; Y = other.Y; return *this; }
|
||||
|
||||
vector2d<T>& operator=(const dimension2d<T>& other) { X = other.Width; Y = other.Height; return *this; }
|
||||
|
||||
vector2d<T> operator+(const vector2d<T>& other) const { return vector2d<T>(X + other.X, Y + other.Y); }
|
||||
|
@ -28,15 +28,11 @@ namespace core
|
||||
vector3d(T nx, T ny, T nz) : X(nx), Y(ny), Z(nz) {}
|
||||
//! Constructor with the same value for all elements
|
||||
explicit vector3d(T n) : X(n), Y(n), Z(n) {}
|
||||
//! Copy constructor
|
||||
vector3d(const vector3d<T>& other) : X(other.X), Y(other.Y), Z(other.Z) {}
|
||||
|
||||
// operators
|
||||
|
||||
vector3d<T> operator-() const { return vector3d<T>(-X, -Y, -Z); }
|
||||
|
||||
vector3d<T>& operator=(const vector3d<T>& other) { X = other.X; Y = other.Y; Z = other.Z; return *this; }
|
||||
|
||||
vector3d<T> operator+(const vector3d<T>& other) const { return vector3d<T>(X + other.X, Y + other.Y, Z + other.Z); }
|
||||
vector3d<T>& operator+=(const vector3d<T>& other) { X+=other.X; Y+=other.Y; Z+=other.Z; return *this; }
|
||||
vector3d<T> operator+(const T val) const { return vector3d<T>(X + val, Y + val, Z + val); }
|
||||
|
Reference in New Issue
Block a user