diff options
author | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
---|---|---|
committer | Logan Dethrow <log@lindenlab.com> | 2012-12-11 16:38:10 -0500 |
commit | 03025733484f7f1ea46d0356e65b0d142bc1dbdb (patch) | |
tree | d48902f9fab2fdc4d15850ffee3d6860f550bcb4 /indra/llcommon/tests/llinstancetracker_test.cpp | |
parent | edcdce226a7ff599e43c89fe7e4d37350650ae96 (diff) | |
parent | 798377b076fbce895ba2075417107de0da10b9ca (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llcommon/tests/llinstancetracker_test.cpp')
-rw-r--r-- | indra/llcommon/tests/llinstancetracker_test.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llinstancetracker_test.cpp b/indra/llcommon/tests/llinstancetracker_test.cpp index 454695ff9f..e769c3e22c 100644 --- a/indra/llcommon/tests/llinstancetracker_test.cpp +++ b/indra/llcommon/tests/llinstancetracker_test.cpp @@ -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&) { |