From 6ce61d1a6fd912c99284875a9052475e06fba432 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sun, 3 Aug 2014 11:57:05 +0200 Subject: Fixed a ToLua warning - operator = not supported. --- src/BlockID.cpp | 2 +- src/Cuboid.cpp | 2 +- src/Cuboid.h | 6 +++++- src/Entities/EntityEffect.cpp | 2 +- src/Entities/EntityEffect.h | 2 +- src/Globals.h | 4 ++-- src/Matrix4.h | 4 ++++ src/WorldStorage/WorldStorage.h | 2 +- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/BlockID.cpp b/src/BlockID.cpp index d145a2e5b..07a1fc9e5 100644 --- a/src/BlockID.cpp +++ b/src/BlockID.cpp @@ -17,7 +17,7 @@ class cBlockIDMap // Making the map case-insensitive: struct Comparator { - bool operator()(const AString & a_Item1, const AString & a_Item2) const + bool operator ()(const AString & a_Item1, const AString & a_Item2) const { return (NoCaseCompare(a_Item1, a_Item2) > 0); } diff --git a/src/Cuboid.cpp b/src/Cuboid.cpp index 26e86c77b..8891cfcb1 100644 --- a/src/Cuboid.cpp +++ b/src/Cuboid.cpp @@ -24,7 +24,7 @@ static bool DoIntervalsIntersect(int a_Min1, int a_Max1, int a_Min2, int a_Max2) //////////////////////////////////////////////////////////////////////////////// // cCuboid: -cCuboid & cCuboid::operator=(cCuboid a_Other) +cCuboid & cCuboid::operator =(cCuboid a_Other) { std::swap(p1, a_Other.p1); std::swap(p2, a_Other.p2); diff --git a/src/Cuboid.h b/src/Cuboid.h index d62cf8063..c205156ec 100644 --- a/src/Cuboid.h +++ b/src/Cuboid.h @@ -20,7 +20,11 @@ public: cCuboid(int a_X1, int a_Y1, int a_Z1) : p1(a_X1, a_Y1, a_Z1), p2(a_X1, a_Y1, a_Z1) {} 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) {} - cCuboid & operator=(cCuboid a_Other); + // tolua_end + + cCuboid & operator =(cCuboid a_Other); + + // tolua_begin 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); diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp index 39314f256..3e28392f4 100644 --- a/src/Entities/EntityEffect.cpp +++ b/src/Entities/EntityEffect.cpp @@ -170,7 +170,7 @@ cEntityEffect::cEntityEffect(const cEntityEffect & a_OtherEffect): -cEntityEffect & cEntityEffect::operator=(cEntityEffect a_OtherEffect) +cEntityEffect & cEntityEffect::operator =(cEntityEffect a_OtherEffect) { std::swap(m_Ticks, a_OtherEffect.m_Ticks); std::swap(m_Duration, a_OtherEffect.m_Duration); diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h index f9c1e4eb2..47c298f57 100644 --- a/src/Entities/EntityEffect.h +++ b/src/Entities/EntityEffect.h @@ -71,7 +71,7 @@ public: /** Creates an entity effect by copying another @param a_OtherEffect The other effect to copy */ - cEntityEffect & operator=(cEntityEffect a_OtherEffect); + cEntityEffect & operator =(cEntityEffect a_OtherEffect); virtual ~cEntityEffect(void) {} diff --git a/src/Globals.h b/src/Globals.h index b35af9604..60ee456c9 100644 --- a/src/Globals.h +++ b/src/Globals.h @@ -156,11 +156,11 @@ template class SizeChecker; template class SizeChecker; template class SizeChecker; -// A macro to disallow the copy constructor and operator= functions +// A macro to disallow the copy constructor and operator = functions // This should be used in the private: declarations for any class that shouldn't allow copying itself #define DISALLOW_COPY_AND_ASSIGN(TypeName) \ TypeName(const TypeName &); \ - void operator=(const TypeName &) + void operator =(const TypeName &) // A macro that is used to mark unused function parameters, to avoid pedantic warnings in gcc #define UNUSED(X) (void)(X) diff --git a/src/Matrix4.h b/src/Matrix4.h index 081847b9f..61ea60bfd 100644 --- a/src/Matrix4.h +++ b/src/Matrix4.h @@ -34,6 +34,8 @@ public: { *this = a_Rhs; } + + // tolua_end inline Matrix4 & operator = (const Matrix4 & a_Rhs) { @@ -43,6 +45,8 @@ public: } return *this; } + + // tolua_begin inline T & operator [] (int a_N) { diff --git a/src/WorldStorage/WorldStorage.h b/src/WorldStorage/WorldStorage.h index 978a5b5d1..5d8aa4589 100644 --- a/src/WorldStorage/WorldStorage.h +++ b/src/WorldStorage/WorldStorage.h @@ -93,7 +93,7 @@ protected: sChunkLoad(int a_ChunkX, int a_ChunkY, int a_ChunkZ, bool a_Generate) : m_ChunkX(a_ChunkX), m_ChunkY(a_ChunkY), m_ChunkZ(a_ChunkZ), m_Generate(a_Generate) {} - bool operator==(const sChunkLoad other) const + bool operator ==(const sChunkLoad other) const { return this->m_ChunkX == other.m_ChunkX && this->m_ChunkY == other.m_ChunkY && -- cgit v1.2.3