diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2011-04-27 19:20:55 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2011-04-27 19:20:55 -0700 |
| commit | 0d5a0cefd4d5b34d3c8e9d06621ec3e1f4e5d46b (patch) | |
| tree | 5dd4cd54aa25d5f44421098084e66f9185c9f27e /indra/llvfs | |
| parent | 42fe138cbb1af4acbb6851711f8c7f86c65795c0 (diff) | |
| parent | 8a265498d02ee9322b5ed6dbd1fae6b60dbe843d (diff) | |
Merge
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/llvfs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 82166d3e56..78b67e9b68 100644 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp @@ -1712,7 +1712,7 @@ void LLVFS::audit() BOOL vfs_corrupt = FALSE; // since we take the address of element 0, we need to have at least one element. - std::vector<U8> buffer(llmax(index_size,1U)); + std::vector<U8> buffer(llmax<size_t>(index_size,1U)); if (fread(&buffer[0], 1, index_size, mIndexFP) != index_size) { |