From e10b4216414857ba6c27c71403ee381e49d996f7 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Thu, 23 Jul 2015 20:08:12 +1000 Subject: [PATCH] C4458 declaration hides class member. There are plenty more of these, but they should be fixed by revising the names of members to start with m, instead of fixing the local violations. There was a previous PR for that but it went badly. Will retry again one day. --- Engine/source/math/mMatrix.h | 4 ++-- Engine/source/ts/loader/appMesh.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Engine/source/math/mMatrix.h b/Engine/source/math/mMatrix.h index f3899d0da..71a95946b 100644 --- a/Engine/source/math/mMatrix.h +++ b/Engine/source/math/mMatrix.h @@ -572,10 +572,10 @@ inline MatrixF operator * ( const MatrixF &m1, const MatrixF &m2 ) return temp; } -inline MatrixF& MatrixF::operator *= ( const MatrixF &m ) +inline MatrixF& MatrixF::operator *= ( const MatrixF &m1 ) { MatrixF tempThis(*this); - m_matF_x_matF(tempThis, m, *this); + m_matF_x_matF(tempThis, m1, *this); return (*this); } diff --git a/Engine/source/ts/loader/appMesh.h b/Engine/source/ts/loader/appMesh.h index dc6b193c6..f2fb7c25e 100644 --- a/Engine/source/ts/loader/appMesh.h +++ b/Engine/source/ts/loader/appMesh.h @@ -99,7 +99,7 @@ public: virtual bool isSkin() { return false; } virtual void lookupSkinData() = 0; - virtual void lockMesh(F32 t, const MatrixF& objectOffset) { } + virtual void lockMesh(F32 t, const MatrixF& objOffset) { } }; #endif // _APPMESH_H_