summaryrefslogtreecommitdiff
path: root/shell/source/win32
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-07-13 14:01:11 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-13 14:02:17 +0200
commit09a5a74956b96b69ec93687f5a902b1c4f937d9e (patch)
tree67be96ce5c7c746af24a9d3a6ea6d2152328bd24 /shell/source/win32
parent48ab773e681b1f129e9196c11f5d44b0caf3dbe9 (diff)
warning C4267: conversion from 'size_t' to 'unsigned long'
Change-Id: I1d922e5b3c7959022b6f57c33b9a4976a16305f6
Diffstat (limited to 'shell/source/win32')
-rw-r--r--shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index e4ace54674d8..1ce8dfb6e503 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -127,7 +127,7 @@ FileStream::~FileStream()
unsigned long FileStream::sread (unsigned char *buf, unsigned long size)
{
if (file)
- return fread(buf, 1, size, file);
+ return static_cast<unsigned long>(fread(buf, 1, size, file));
return 0;
}