diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/test/llstring_tut.cpp | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to '')
-rw-r--r-- | linden/indra/test/llstring_tut.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/linden/indra/test/llstring_tut.cpp b/linden/indra/test/llstring_tut.cpp index ba6ac7c..d17dd15 100644 --- a/linden/indra/test/llstring_tut.cpp +++ b/linden/indra/test/llstring_tut.cpp | |||
@@ -6,7 +6,7 @@ | |||
6 | * | 6 | * |
7 | * $LicenseInfo:firstyear=2007&license=viewergpl$ | 7 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
8 | * | 8 | * |
9 | * Copyright (c) 2007-2008, Linden Research, Inc. | 9 | * Copyright (c) 2007-2009, Linden Research, Inc. |
10 | * | 10 | * |
11 | * Second Life Viewer Source Code | 11 | * Second Life Viewer Source Code |
12 | * The source code in this file ("Source Code") is provided by Linden Lab | 12 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -344,13 +344,8 @@ namespace tut | |||
344 | str_val = "0"; | 344 | str_val = "0"; |
345 | ensure("2: convertToU32 failed", LLStringUtil::convertToU32(str_val, value) && value == 0); | 345 | ensure("2: convertToU32 failed", LLStringUtil::convertToU32(str_val, value) && value == 0); |
346 | 346 | ||
347 | #ifndef LL_DARWIN | ||
348 | str_val = "-1"; | ||
349 | ensure("3: convertToU32 failed", LLStringUtil::convertToU32(str_val, value) && value == 4294967295UL); | ||
350 | #endif | ||
351 | |||
352 | str_val = "4294967296"; | 347 | str_val = "4294967296"; |
353 | ensure("4: convertToU32 failed", !LLStringUtil::convertToU32(str_val, value)); | 348 | ensure("3: convertToU32 failed", !LLStringUtil::convertToU32(str_val, value)); |
354 | } | 349 | } |
355 | 350 | ||
356 | template<> template<> | 351 | template<> template<> |