diff options
author | peterbell10 <peterbell10@live.co.uk> | 2017-08-28 13:49:33 +0200 |
---|---|---|
committer | peterbell10 <peterbell10@live.co.uk> | 2017-08-28 14:48:10 +0200 |
commit | f89becc7610af1ccf396831dd829fe6e04159e5b (patch) | |
tree | b6d5adb716483ba1e1693399b22d9d771154545e /src/Cuboid.h | |
parent | Cleanup Vector3 constructors and Abs (diff) | |
download | cuberite-f89becc7610af1ccf396831dd829fe6e04159e5b.tar cuberite-f89becc7610af1ccf396831dd829fe6e04159e5b.tar.gz cuberite-f89becc7610af1ccf396831dd829fe6e04159e5b.tar.bz2 cuberite-f89becc7610af1ccf396831dd829fe6e04159e5b.tar.lz cuberite-f89becc7610af1ccf396831dd829fe6e04159e5b.tar.xz cuberite-f89becc7610af1ccf396831dd829fe6e04159e5b.tar.zst cuberite-f89becc7610af1ccf396831dd829fe6e04159e5b.zip |
Diffstat (limited to 'src/Cuboid.h')
-rw-r--r-- | src/Cuboid.h | 11 |
1 files changed, 4 insertions, 7 deletions
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); |