diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-07-12 10:08:56 -0400 |
| commit | 73d90aa9dd87986dc2ef8f39db346b71c58b181b (patch) | |
| tree | a2ec930f732aaed7d7addbb22bb34b15c78d408b /indra/llcorehttp/bufferarray.cpp | |
| parent | 8e70575be833cf2056b1ceef7ef842cbc7700ce0 (diff) | |
| parent | e80f0f331dbfca686e0a80c557e9b1e455c8d167 (diff) | |
SL-18837: Merge branch 'DRTVWR-587-maint-V' into rm-cxxstd.
Diffstat (limited to 'indra/llcorehttp/bufferarray.cpp')
| -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) |