Cleaned interface

And fixed some VS warnings


Former-commit-id: 8c89fa1d4dc92a362053e4cdeabe20537fcec2a6
This commit is contained in:
Lynix
2013-06-09 11:25:17 +02:00
parent 8460a96744
commit c76c419867
6 changed files with 18 additions and 22 deletions

View File

@@ -35,7 +35,7 @@ nzUInt64 NzMemoryStream::GetSize() const
std::size_t NzMemoryStream::Read(void* buffer, std::size_t size)
{
unsigned int readSize = std::min(static_cast<nzUInt64>(size), m_size-m_pos);
unsigned int readSize = std::min(static_cast<unsigned int>(size), static_cast<unsigned int>(m_size-m_pos));
std::memcpy(buffer, &m_ptr[m_pos], readSize);
m_pos += readSize;