diff options
| author | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2020-05-04 10:53:11 -0700 |
| commit | 691a2d996cb364201d8e73378eab0d3d09eddb08 (patch) | |
| tree | 49c26bb103d30daf398e57c51a424639d80f5b03 /indra/llcorehttp | |
| parent | 77d2a05921bdba3ac284350650c5394dcc8e3444 (diff) | |
| parent | 4a7fd0117a43dca9e30c58c6417ebdf6862561f6 (diff) | |
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-512
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); |