diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:21:51 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-19 17:21:51 -0400 |
| commit | 84278d0d2c404a02c6292a6d99f38a88e77a6490 (patch) | |
| tree | bd961ca166a22cc7c6a5e65da585ea0f705dda9d /indra/llcorehttp | |
| parent | 22a07b1121bb429e6bfe10b5a5e859bcea1262b6 (diff) | |
| parent | a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 (diff) | |
SL-18837: Merge branch 'xcode-14.1' of secondlife/viewer into xcode-14.3
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/bufferarray.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp index e0b2876a00..8d2e7c6a63 100644 --- a/indra/llcorehttp/bufferarray.cpp +++ b/indra/llcorehttp/bufferarray.cpp @@ -196,7 +196,7 @@ size_t BufferArray::read(size_t pos, void * dst, size_t len) return 0; size_t result(0), offset(0); - const int block_limit(mBlocks.size()); + const auto block_limit(mBlocks.size()); int block_start(findBlock(pos, &offset)); if (block_start < 0) return 0; @@ -228,7 +228,7 @@ size_t BufferArray::write(size_t pos, const void * src, size_t len) return 0; size_t result(0), offset(0); - const int block_limit(mBlocks.size()); + const auto block_limit(mBlocks.size()); int block_start(findBlock(pos, &offset)); if (block_start >= 0) @@ -288,7 +288,7 @@ int BufferArray::findBlock(size_t pos, size_t * ret_offset) if (pos >= mLen) return -1; // Doesn't exist - const int block_limit(mBlocks.size()); + const int block_limit(narrow(mBlocks.size())); for (int i(0); i < block_limit; ++i) { if (pos < mBlocks[i]->mUsed) |