summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-10-22 21:26:24 -0400
committerOz Linden <oz@lindenlab.com>2014-10-22 21:26:24 -0400
commitcc54f34d3fb66892258f82164bce67893f7cbff6 (patch)
tree31ade7b47186c43c39159021fbd2032fbdecca28 /indra
parent9e9779d3f88a35bd9d3eb949b6fa08a36b505d5f (diff)
parent2b8673d15a9298dde00f69373735abf68d11e5d3 (diff)
merge with head
Diffstat (limited to 'indra')
-rwxr-xr-xindra/test/llsd_new_tut.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/test/llsd_new_tut.cpp b/indra/test/llsd_new_tut.cpp
index 03df1d339b..e1de1bbd34 100755
--- a/indra/test/llsd_new_tut.cpp
+++ b/indra/test/llsd_new_tut.cpp
@@ -112,15 +112,15 @@ namespace tut
SDTestGroup sdTestGroup("LLSD(new)");
- template<> template<>
- void SDTestObject::test<1>()
- // construction and test of undefined
- {
- SDCleanupCheck check;
-
- LLSD u;
- ensure("is undefined", u.isUndefined());
- }
+ // template<> template<>
+ // void SDTestObject::test<1>()
+ // // construction and test of undefined
+ // {
+ // SDCleanupCheck check;
+
+ // LLSD u;
+ // ensure("is undefined", u.isUndefined());
+ // }
template<> template<>
void SDTestObject::test<2>()