diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/test/llsdserialize_tut.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/test/llsdserialize_tut.cpp')
-rw-r--r-- | linden/indra/test/llsdserialize_tut.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/test/llsdserialize_tut.cpp b/linden/indra/test/llsdserialize_tut.cpp index 467470a..6fcbe4b 100644 --- a/linden/indra/test/llsdserialize_tut.cpp +++ b/linden/indra/test/llsdserialize_tut.cpp | |||
@@ -18,7 +18,8 @@ | |||
18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
21 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception | 21 | * online at |
22 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
22 | * | 23 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
@@ -30,7 +31,7 @@ | |||
30 | * $/LicenseInfo$ | 31 | * $/LicenseInfo$ |
31 | */ | 32 | */ |
32 | 33 | ||
33 | #include <tut/tut.h> | 34 | #include <tut/tut.hpp> |
34 | 35 | ||
35 | #if !LL_WINDOWS | 36 | #if !LL_WINDOWS |
36 | #include <netinet/in.h> | 37 | #include <netinet/in.h> |
@@ -242,7 +243,7 @@ namespace tut | |||
242 | 243 | ||
243 | try | 244 | try |
244 | { | 245 | { |
245 | ensure_equals(msg, w, v); | 246 | ensure_equals(msg.c_str(), w, v); |
246 | } | 247 | } |
247 | catch (...) | 248 | catch (...) |
248 | { | 249 | { |
@@ -490,7 +491,7 @@ namespace tut | |||
490 | LLSD parsed_result; | 491 | LLSD parsed_result; |
491 | mParser->reset(); // reset() call is needed since test code re-uses mParser | 492 | mParser->reset(); // reset() call is needed since test code re-uses mParser |
492 | S32 parsed_count = mParser->parse(input, parsed_result, in.size()); | 493 | S32 parsed_count = mParser->parse(input, parsed_result, in.size()); |
493 | ensure_equals(msg, parsed_result, expected_value); | 494 | ensure_equals(msg.c_str(), parsed_result, expected_value); |
494 | 495 | ||
495 | // This count check is really only useful for expected | 496 | // This count check is really only useful for expected |
496 | // parse failures, since the ensures equal will already | 497 | // parse failures, since the ensures equal will already |
@@ -1283,7 +1284,7 @@ namespace tut | |||
1283 | count4, | 1284 | count4, |
1284 | count3); | 1285 | count3); |
1285 | ensure_equals( | 1286 | ensure_equals( |
1286 | msg + " (binaryandnotation)", | 1287 | (msg + " (binaryandnotation)").c_str(), |
1287 | actual_value_notation, | 1288 | actual_value_notation, |
1288 | input); | 1289 | input); |
1289 | } | 1290 | } |
@@ -1318,7 +1319,7 @@ namespace tut | |||
1318 | "ensureBinaryAndXML xml count2", | 1319 | "ensureBinaryAndXML xml count2", |
1319 | count4, | 1320 | count4, |
1320 | count3); | 1321 | count3); |
1321 | ensure_equals(msg + " (binaryandxml)", actual_value_xml, input); | 1322 | ensure_equals((msg + " (binaryandxml)").c_str(), actual_value_xml, input); |
1322 | } | 1323 | } |
1323 | }; | 1324 | }; |
1324 | 1325 | ||