소스 검색

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.
Daniel Buckmaster 10 년 전
부모
커밋
e10b421641
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 2 2
      Engine/source/math/mMatrix.h
  2. 1 1
      Engine/source/ts/loader/appMesh.h

+ 2 - 2
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);
 }
 

+ 1 - 1
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_