summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/bufferarray.cpp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2012-06-12 12:41:09 -0400
committerMonty Brandenberg <monty@lindenlab.com>2012-06-12 12:41:09 -0400
commit24e16e1632974057013b86300bb60954ea6f5684 (patch)
tree09fccb4bcbf24721129e1d01bdb2e3337cd9ccc2 /indra/llcorehttp/bufferarray.cpp
parent75242eab8f8a892c792681fca080d86cfbb3e061 (diff)
Convert _refcounted.h over to using LLAtomic32<>.
Beware of bad documentation. operator--(int) does not return what the header claimed it did.
Diffstat (limited to 'indra/llcorehttp/bufferarray.cpp')
-rw-r--r--indra/llcorehttp/bufferarray.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp
index 6d5309a043..ae92057df0 100644
--- a/indra/llcorehttp/bufferarray.cpp
+++ b/indra/llcorehttp/bufferarray.cpp
@@ -175,7 +175,7 @@ size_t BufferArray::read(size_t pos, void * dst, size_t len)
if (pos >= mLen)
return 0;
size_t len_limit(mLen - pos);
- len = std::min(len, len_limit);
+ len = (std::min)(len, len_limit);
if (0 == len)
return 0;
@@ -189,7 +189,7 @@ size_t BufferArray::read(size_t pos, void * dst, size_t len)
{
Block & block(*mBlocks[block_start]);
size_t block_limit(block.mUsed - offset);
- size_t block_len(std::min(block_limit, len));
+ size_t block_len((std::min)(block_limit, len));
memcpy(c_dst, &block.mData[offset], block_len);
result += block_len;
@@ -223,7 +223,7 @@ size_t BufferArray::write(size_t pos, const void * src, size_t len)
{
Block & block(*mBlocks[block_start]);
size_t block_limit(block.mUsed - offset);
- size_t block_len(std::min(block_limit, len));
+ size_t block_len((std::min)(block_limit, len));
memcpy(&block.mData[offset], c_src, block_len);
result += block_len;