From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/test/v3dmath_tut.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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

diff --git a/linden/indra/test/v3dmath_tut.cpp b/linden/indra/test/v3dmath_tut.cpp
index 106b1dc..a501531 100644
--- a/linden/indra/test/v3dmath_tut.cpp
+++ b/linden/indra/test/v3dmath_tut.cpp
@@ -386,7 +386,7 @@ namespace tut
 	void v3dmath_object::test<16>()
 	{
 		F64 x1 = 1.23, y1 = 2.0, z1 = 4.;
-		char buf[] = "1.23 2. 4";
+		std::string buf("1.23 2. 4");
 		LLVector3d vec3D, vec3Da(x1,y1,z1);
 		LLVector3d::parseVector3d(buf, &vec3D);
 		ensure_equals("1:parseVector3d: failed " , vec3D, vec3Da);	
@@ -461,7 +461,7 @@ namespace tut
 		F64 x1 = 1111.232222;
 		F64 y1 = 2222222222.22;
 		F64 z1 = 422222222222.0;
-		char buf[] = "1111.232222 2222222222.22 422222222222";
+		std::string buf("1111.232222 2222222222.22 422222222222");
 		LLVector3d vec3Da, vec3Db(x1,y1,z1);
 		LLVector3d::parseVector3d(buf, &vec3Da);
 		ensure_equals("1:parseVector3 failed", vec3Da, vec3Db);	
@@ -509,6 +509,9 @@ namespace tut
 	template<> template<>
 	void v3dmath_object::test<24>()
 	{
+#if LL_WINDOWS && _MSC_VER < 1400
+		skip_fail("This fails on VS2003!");
+#else
 		F64 x = 10., y = 20., z = -15.;
 		F64 angle1, angle2;
 		LLVector3d vec3Da(x,y,z), vec3Db(x,y,z);
@@ -523,5 +526,6 @@ namespace tut
 		F64 angle = vec3Db*vec3Da;
 		angle = acos(angle);
 		ensure("2:angle_between: Fail ", (angle == angle2));
+#endif
 	}
 }
-- 
cgit v1.1