diff options
Diffstat (limited to 'indra/llcommon/tests/llinstancetracker_test.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/tests/llinstancetracker_test.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/indra/llcommon/tests/llinstancetracker_test.cpp b/indra/llcommon/tests/llinstancetracker_test.cpp index 454695ff9f..c7d4b8a06b 100644..100755 --- a/indra/llcommon/tests/llinstancetracker_test.cpp +++ b/indra/llcommon/tests/llinstancetracker_test.cpp @@ -194,15 +194,15 @@ namespace tut { set_test_name("delete Keyed with outstanding instance_iter"); std::string what; - Keyed* keyed = new Keyed("one"); + Keyed* keyed = new Keyed("delete Keyed with outstanding instance_iter"); { - WrapLL_ERRS wrapper; + WrapLLErrs wrapper; Keyed::instance_iter i(Keyed::beginInstances()); try { delete keyed; } - catch (const WrapLL_ERRS::FatalException& e) + catch (const WrapLLErrs::FatalException& e) { what = e.what(); } @@ -215,15 +215,15 @@ namespace tut { set_test_name("delete Keyed with outstanding key_iter"); std::string what; - Keyed* keyed = new Keyed("one"); + Keyed* keyed = new Keyed("delete Keyed with outstanding key_it"); { - WrapLL_ERRS wrapper; + WrapLLErrs wrapper; Keyed::key_iter i(Keyed::beginKeys()); try { delete keyed; } - catch (const WrapLL_ERRS::FatalException& e) + catch (const WrapLLErrs::FatalException& e) { what = e.what(); } @@ -238,13 +238,13 @@ namespace tut std::string what; Unkeyed* unkeyed = new Unkeyed; { - WrapLL_ERRS wrapper; + WrapLLErrs wrapper; Unkeyed::instance_iter i(Unkeyed::beginInstances()); try { delete unkeyed; } - catch (const WrapLL_ERRS::FatalException& e) + catch (const WrapLLErrs::FatalException& e) { what = e.what(); } @@ -267,7 +267,6 @@ namespace tut { existing.insert(&*uki); } - Unkeyed* puk = NULL; try { // We don't expect the assignment to take place because we expect @@ -280,7 +279,7 @@ namespace tut // realize we're testing the C++ implementation more than // Unkeyed's implementation, but this seems an important point to // nail down. - puk = new Unkeyed("throw"); + new Unkeyed("throw"); } catch (const Badness&) { |