diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2022-12-12 17:44:47 +0200 |
| commit | 2b7ba3f90455d675770e68f7e338d39053a343b9 (patch) | |
| tree | 652c664acf1d848e894637c47c93f9aa17289954 /indra/llcorehttp | |
| parent | 80e39507810ea0d5e9931bea79e0bfda3e77ab9e (diff) | |
| parent | 7d9249d180f7bc228cad3d6f5ed4d5fb13296451 (diff) | |
Merge branch 'xcode-14.1' into contribute
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) |