Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Random VS warnings #1371

Merged
merged 2 commits into from Jul 25, 2015
Merged

Random VS warnings #1371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e2de60
C4091 typedef ignored.
crabmusket Jul 23, 2015
e10b421
C4458 declaration hides class member.
crabmusket Jul 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Engine/source/console/compiler.h
View file
Open in desktop
Expand Up @@ -310,7 +310,7 @@ class CodeStream
U8 *data; ///< Allocated data (size is BlockSize)
U32 size; ///< Bytes used in data
CodeData *next; ///< Next block
};
} CodeData;

/// @name Emitted code
/// {
Expand Down
4 changes: 2 additions & 2 deletions Engine/source/math/mMatrix.h
View file
Open in desktop
Expand Up @@ -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 )
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is m1 to align with the previous function above.

{
MatrixF tempThis(*this);
m_matF_x_matF(tempThis, m, *this);
m_matF_x_matF(tempThis, m1, *this);
return (*this);
}

Expand Down
2 changes: 1 addition & 1 deletion Engine/source/ts/loader/appMesh.h
View file
Open in desktop
Expand Up @@ -99,7 +99,7 @@ class AppMesh
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_