From 31e7c77a411d94bc87f0232588b339149bb29a49 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 28 Sep 2008 17:21:23 -0500
Subject: Second Life viewer sources 1.21.3-RC

---
 linden/indra/test/llstring_tut.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'linden/indra/test/llstring_tut.cpp')

diff --git a/linden/indra/test/llstring_tut.cpp b/linden/indra/test/llstring_tut.cpp
index 191b804..ba6ac7c 100644
--- a/linden/indra/test/llstring_tut.cpp
+++ b/linden/indra/test/llstring_tut.cpp
@@ -564,18 +564,21 @@ namespace tut
 		for (LLStringUtil::format_map_t::const_iterator iter = fmt_map.begin(); iter != fmt_map.end(); ++iter)
 		{
 			// Test when source string is entirely one key
-			s = iter->first;
-			subcount = LLStringUtil::format(s, fmt_map);
-			ensure_equals("LLStringUtil::format: Raw interpolation result", s, iter->second);
+			std::string s1 = (std::string)iter->first;
+			std::string s2 = (std::string)iter->second;
+			subcount = LLStringUtil::format(s1, fmt_map);
+			ensure_equals("LLStringUtil::format: Raw interpolation result", s1, s2);
 			ensure_equals("LLStringUtil::format: Raw interpolation result count", 1, subcount);
 		}
 
 		for (LLStringUtil::format_map_t::const_iterator iter = fmt_map.begin(); iter != fmt_map.end(); ++iter)
 		{
 			// Test when source string is one key, duplicated
-			s = iter->first + iter->first + iter->first + iter->first;
+			std::string s1 = (std::string)iter->first;
+			std::string s2 = (std::string)iter->second;
+			s = s1 + s1 + s1 + s1;
 			subcount = LLStringUtil::format(s, fmt_map);
-			ensure_equals("LLStringUtil::format: Rawx4 interpolation result", s, iter->second + iter->second + iter->second + iter->second);
+			ensure_equals("LLStringUtil::format: Rawx4 interpolation result", s, s2 + s2 + s2 + s2);
 			ensure_equals("LLStringUtil::format: Rawx4 interpolation result count", 4, subcount);
 		}
 
-- 
cgit v1.1