Fixed some VS warnings
Thanks to Fraggy again ! Former-commit-id: bd0eea66714701b065892d8b69d576e7b3615dd2
This commit is contained in:
@@ -237,7 +237,7 @@ std::size_t NzFile::Read(void* buffer, std::size_t size)
|
||||
|
||||
m_impl->SetCursorPos(NzFile::AtCurrent, size);
|
||||
|
||||
return m_impl->GetCursorPos()-currentPos;
|
||||
return static_cast<std::size_t>(m_impl->GetCursorPos()-currentPos);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ namespace
|
||||
* On little-endian machines, we can process properly aligned
|
||||
* data without copying it.
|
||||
*/
|
||||
if (!(data - static_cast<const nzUInt8*>(nullptr)) & 3)
|
||||
if (!((data - static_cast<const nzUInt8*>(nullptr)) & 3))
|
||||
{
|
||||
/* data are properly aligned */
|
||||
X = reinterpret_cast<const nzUInt32*>(data);
|
||||
|
||||
@@ -135,7 +135,7 @@ bool operator>=(const NzThread::Id& lhs, const NzThread::Id& rhs)
|
||||
return lhs.m_id >= rhs.m_id;
|
||||
}
|
||||
|
||||
bool operator<<(std::ostream& o, const NzThread::Id& id)
|
||||
std::ostream& operator<<(std::ostream& o, const NzThread::Id& id)
|
||||
{
|
||||
o << id.m_id;
|
||||
return o;
|
||||
|
||||
Reference in New Issue
Block a user