first round of Intel compiler warning fixes: down from a few thousands just to slightly more than 100
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35688 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -576,7 +576,7 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
|
||||
}
|
||||
if (diff < 0 || diff > last_access)
|
||||
return wxInvalidOffset;
|
||||
size_t int_diff = (size_t)diff;
|
||||
size_t int_diff = wx_truncate_cast(size_t, diff);
|
||||
wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") );
|
||||
SetIntPosition(int_diff);
|
||||
return diff;
|
||||
@@ -603,7 +603,7 @@ wxFileOffset wxStreamBuffer::Seek(wxFileOffset pos, wxSeekMode mode)
|
||||
}
|
||||
else
|
||||
{
|
||||
size_t int_diff = (size_t)diff;
|
||||
size_t int_diff = wx_truncate_cast(size_t, diff);
|
||||
wxCHECK_MSG( (wxFileOffset)int_diff == diff, wxInvalidOffset, wxT("huge file not supported") );
|
||||
SetIntPosition(int_diff);
|
||||
return pos;
|
||||
@@ -660,7 +660,13 @@ wxStreamBase::~wxStreamBase()
|
||||
size_t wxStreamBase::GetSize() const
|
||||
{
|
||||
wxFileOffset length = GetLength();
|
||||
return length == wxInvalidOffset ? 0 : (size_t)length;
|
||||
if ( length == wxInvalidOffset )
|
||||
return 0;
|
||||
|
||||
const size_t len = wx_truncate_cast(size_t, length);
|
||||
wxASSERT_MSG( len == length, _T("large files not supported") );
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
wxFileOffset wxStreamBase::OnSysSeek(wxFileOffset WXUNUSED(seek), wxSeekMode WXUNUSED(mode))
|
||||
@@ -994,7 +1000,7 @@ size_t wxCountingOutputStream::OnSysWrite(const void *WXUNUSED(buffer),
|
||||
|
||||
wxFileOffset wxCountingOutputStream::OnSysSeek(wxFileOffset pos, wxSeekMode mode)
|
||||
{
|
||||
ssize_t new_pos = (ssize_t)pos;
|
||||
ssize_t new_pos = wx_truncate_cast(ssize_t, pos);
|
||||
|
||||
switch ( mode )
|
||||
{
|
||||
|
Reference in New Issue
Block a user