diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-10-11 10:54:16 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-10-11 10:54:16 -0700 |
| commit | 076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (patch) | |
| tree | 58e7cd0674a1286544f883257cc2f43969ea201f /indra/llcorehttp | |
| parent | e5aeaa659a453674ef898cdd2ad6183d5eb77e41 (diff) | |
| parent | 58aef8beaf79dc83546a7b080014ca5030733ac8 (diff) | |
Merge
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/httpstats.cpp | 2 | ||||
| -rw-r--r-- | indra/llcorehttp/tests/test_refcounted.hpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcorehttp/httpstats.cpp b/indra/llcorehttp/httpstats.cpp index b2de7f51ff..19eceae5ef 100644 --- a/indra/llcorehttp/httpstats.cpp +++ b/indra/llcorehttp/httpstats.cpp @@ -101,7 +101,7 @@ void HTTPStats::dumpStats() out << (*it).first << " " << (*it).second << std::endl; } - LL_WARNS("HTTP Core") << out.str() << LL_ENDL; + LL_WARNS("HTTPCore") << out.str() << LL_ENDL; } diff --git a/indra/llcorehttp/tests/test_refcounted.hpp b/indra/llcorehttp/tests/test_refcounted.hpp index cb4b50287a..5dff143e5d 100644 --- a/indra/llcorehttp/tests/test_refcounted.hpp +++ b/indra/llcorehttp/tests/test_refcounted.hpp @@ -30,6 +30,7 @@ #include "test_allocator.h" +#if 0 // disable all of this because it's hanging win64 builds? using namespace LLCoreInt; namespace tut @@ -152,5 +153,5 @@ namespace tut ensure(mMemTotal == (GetMemTotal() - sizeof(RefCounted))); } } - +#endif // if 0 #endif // TEST_LLCOREINT_REF_COUNTED_H_ |