From f89becc7610af1ccf396831dd829fe6e04159e5b Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Mon, 28 Aug 2017 12:49:33 +0100
Subject: cCuboid: restore default copy construct and assign.

---
 src/Cuboid.cpp | 22 ----------------------
 src/Cuboid.h   | 11 ++++-------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/src/Cuboid.cpp b/src/Cuboid.cpp
index c638eb636..7dc39f364 100644
--- a/src/Cuboid.cpp
+++ b/src/Cuboid.cpp
@@ -10,14 +10,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 // cCuboid:
 
-cCuboid & cCuboid::operator =(cCuboid a_Other)
-{
-	std::swap(p1, a_Other.p1);
-	std::swap(p2, a_Other.p2);
-	return *this;
-}
-
-
 void cCuboid::Assign(int a_X1, int a_Y1, int a_Z1, int a_X2, int a_Y2, int a_Z2)
 {
 	p1.x = a_X1;
@@ -32,20 +24,6 @@ void cCuboid::Assign(int a_X1, int a_Y1, int a_Z1, int a_X2, int a_Y2, int a_Z2)
 
 
 
-void cCuboid::Assign(const cCuboid & a_SrcCuboid)
-{
-	p1.x = a_SrcCuboid.p1.x;
-	p1.y = a_SrcCuboid.p1.y;
-	p1.z = a_SrcCuboid.p1.z;
-	p2.x = a_SrcCuboid.p2.x;
-	p2.y = a_SrcCuboid.p2.y;
-	p2.z = a_SrcCuboid.p2.z;
-}
-
-
-
-
-
 void cCuboid::Sort(void)
 {
 	if (p1.x > p2.x)
diff --git a/src/Cuboid.h b/src/Cuboid.h
index b9d5f8cfa..73edd31d9 100644
--- a/src/Cuboid.h
+++ b/src/Cuboid.h
@@ -13,15 +13,12 @@ public:
 	Vector3i p1, p2;
 
 	cCuboid(void) {}
-	cCuboid(const cCuboid & a_Cuboid) : p1(a_Cuboid.p1), p2(a_Cuboid.p2) {}
 	cCuboid(const Vector3i & a_p1, const Vector3i & a_p2) : p1(a_p1), p2(a_p2) {}
 	cCuboid(int a_X1, int a_Y1, int a_Z1) : p1(a_X1, a_Y1, a_Z1), p2(a_X1, a_Y1, a_Z1) {}
 
-	// tolua_end
-
-	cCuboid & operator =(cCuboid a_Other);
-
-	// tolua_begin
+	#if 0  // tolua isn't aware of implicitly generated copy constructors
+		cCuboid(const cCuboid & a_Cuboid);
+	#endif
 
 	// DEPRECATED, use cCuboid(Vector3i, Vector3i) instead
 	cCuboid(int a_X1, int a_Y1, int a_Z1, int a_X2, int a_Y2, int a_Z2) : p1(a_X1, a_Y1, a_Z1), p2(a_X2, a_Y2, a_Z2)
@@ -30,7 +27,7 @@ public:
 	}
 
 	void Assign(int a_X1, int a_Y1, int a_Z1, int a_X2, int a_Y2, int a_Z2);
-	void Assign(const cCuboid & a_SrcCuboid);
+	void Assign(const cCuboid & a_SrcCuboid) { *this = a_SrcCuboid; }
 
 	void Sort(void);
 
-- 
cgit v1.2.3