summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests/llinstancetracker_test.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2013-04-17 13:38:04 -0700
committercallum_linden <none@none>2013-04-17 13:38:04 -0700
commit88eff41649b13f00f636e54e093fd5b8becf5f8c (patch)
treef099a81df2c66e9940aa85ad1f47cc982a5eecc1 /indra/llcommon/tests/llinstancetracker_test.cpp
parent010c87788d5c698d6cfe5782ac02d9a3924124cf (diff)
parentfac6ee27f2d3277494f011271064b0e5e7e02554 (diff)
Merge with viewer-development
Diffstat (limited to 'indra/llcommon/tests/llinstancetracker_test.cpp')
-rw-r--r--indra/llcommon/tests/llinstancetracker_test.cpp3
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&)
{