[Scummvm-git-logs] scummvm master -> 512aec3b6b9887acab82221b81f066f9ce2f33ec

[mduggan]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
512aec3b6b ULTIMA8: Remove explicit copy constructors


Commit: 512aec3b6b9887acab82221b81f066f9ce2f33ec
    https://github.com/scummvm/scummvm/commit/512aec3b6b9887acab82221b81f066f9ce2f33ec
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-05-14T06:58:08+09:00

Commit Message:
ULTIMA8: Remove explicit copy constructors

The implicit ones are fine for these classes, and making them explicit creates
warnings about not having an explicit assignment operator (-Wdeprecated-copy).

I could write more code to fix this, but deleting code is nicer.

Changed paths:
    engines/ultima/ultima8/misc/box.h
    engines/ultima/ultima8/misc/rect.h


diff --git a/engines/ultima/ultima8/misc/box.h b/engines/ultima/ultima8/misc/box.h
index a7e819e189..bfc0a6f860 100644
--- a/engines/ultima/ultima8/misc/box.h
+++ b/engines/ultima/ultima8/misc/box.h
@@ -35,7 +35,6 @@ struct Box {
 	Box() : _x(0), _y(0), _z(0), _xd(0), _yd(0), _zd(0) {}
 	Box(int nx, int ny, int nz, int nxd, int nyd, int nzd)
 		: _x(nx), _y(ny), _z(nz), _xd(nxd), _yd(nyd), _zd(nzd) {}
-	Box(const Box &o) : _x(o._x), _y(o._y), _z(o._z), _xd(o._xd), _yd(o._yd), _zd(o._zd) {}
 
 	void    Set(int nx, int ny, int nz, int nxd, int nyd, int nzd) {
 		_x = nx;
@@ -99,6 +98,7 @@ struct Box {
 		return (_x == o._x && _y == o._y && _z == o._z &&
 		        _xd == o._xd && _yd == o._yd && _zd == o._zd);
 	}
+
 };
 
 } // End of namespace Ultima8
diff --git a/engines/ultima/ultima8/misc/rect.h b/engines/ultima/ultima8/misc/rect.h
index 6c592d1342..2247bd17c7 100644
--- a/engines/ultima/ultima8/misc/rect.h
+++ b/engines/ultima/ultima8/misc/rect.h
@@ -32,7 +32,6 @@ struct Rect {
 
 	Rect() : x(0), y(0), w(0), h(0) {}
 	Rect(int nx, int ny, int nw, int nh) : x(nx), y(ny), w(nw), h(nh) {}
-	Rect(const Rect &o) : x(o.x), y(o.y), w(o.w), h(o.h) {}
 
 	void    Set(int nx, int ny, int nw, int nh) {
 		x = nx;