diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:35:54 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-05-04 23:35:54 +0300 |
| commit | 6364e2fff696090253c902bec02d68f036ad509c (patch) | |
| tree | 8f9f6a8834cf392552c7be07086d9cb0cff61631 /indra/llcorehttp | |
| parent | d3b10072f4c52b01c8d77ad1990d69dd89fc1310 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' into DRTVWR-460
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/_httpservice.cpp | 2 | ||||
| -rw-r--r-- | indra/llcorehttp/bufferarray.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp index 0b72b53186..34268d94f6 100644 --- a/indra/llcorehttp/_httpservice.cpp +++ b/indra/llcorehttp/_httpservice.cpp @@ -318,7 +318,7 @@ void HttpService::threadRun(LLCoreInt::HttpThread * thread) { LOG_UNHANDLED_EXCEPTION(""); } - catch (std::bad_alloc) + catch (std::bad_alloc&) { LLMemory::logMemoryInfo(TRUE); diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp index be534b3ce4..e0b2876a00 100644 --- a/indra/llcorehttp/bufferarray.cpp +++ b/indra/llcorehttp/bufferarray.cpp @@ -147,7 +147,7 @@ size_t BufferArray::append(const void * src, size_t len) { block = Block::alloc(BLOCK_ALLOC_SIZE); } - catch (std::bad_alloc) + catch (std::bad_alloc&) { LLMemory::logMemoryInfo(TRUE); |