diff options
| author | Max Horn | 2011-05-23 13:05:35 +0200 |
|---|---|---|
| committer | Max Horn | 2011-05-23 13:05:35 +0200 |
| commit | 252e7a1ec323fc6cccb91dbdcae92db7efd851a6 (patch) | |
| tree | cad108f6e6b30d4cf5575f5d899bbdb859b77a17 /engines | |
| parent | d25363c6758f4a6bc787621e75385e74a556c9e3 (diff) | |
| download | scummvm-rg350-252e7a1ec323fc6cccb91dbdcae92db7efd851a6.tar.gz scummvm-rg350-252e7a1ec323fc6cccb91dbdcae92db7efd851a6.tar.bz2 scummvm-rg350-252e7a1ec323fc6cccb91dbdcae92db7efd851a6.zip | |
SWORD25: Fix ambiguous typing
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sword25/util/lua/scummvm_file.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sword25/util/lua/scummvm_file.cpp b/engines/sword25/util/lua/scummvm_file.cpp index 98fc1276a7..659f5a36c2 100644 --- a/engines/sword25/util/lua/scummvm_file.cpp +++ b/engines/sword25/util/lua/scummvm_file.cpp @@ -59,7 +59,7 @@ Sword25FileProxy::~Sword25FileProxy() { } size_t Sword25FileProxy::read(void *ptr, size_t size, size_t count) { - size_t bytesRead = MIN(_readData.size() - _readPos, size * count); + size_t bytesRead = MIN<size_t>(_readData.size() - _readPos, size * count); memmove(ptr, &_readData.c_str()[_readPos], bytesRead); _readPos += bytesRead; return bytesRead / size; |