Merge

1 files changed, 25 insertions, 25 deletions

diff --git a/indra/test/llsdmessagebuilder_tut.cpp b/indra/test/llsdmessagebuilder_tut.cpp
index 27ab127772..34f3530308 100755
--- a/indra/test/llsdmessagebuilder_tut.cpp
+++ b/indra/test/llsdmessagebuilder_tut.cpp
@@ -353,7 +353,7 @@ namespace tut
 	{
 	  char binData[] = "abcdefghijklmnop";
 
-	  addValue(messageBlockData, "testBinData", &binData, MVT_FIXED, sizeof(binData));
+	  addValue(messageBlockData, (char *)"testBinData", &binData, MVT_FIXED, sizeof(binData));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -393,7 +393,7 @@ namespace tut
 	{
 	  U16 binData[] = {1,2,3,4,5,6,7,8,9}; //9 shorts
 
-	  addValue(messageBlockData, "testBinData", &binData, MVT_VARIABLE, sizeof(binData) >> 1, 2);
+	  addValue(messageBlockData, (char *)"testBinData", &binData, MVT_VARIABLE, sizeof(binData) >> 1, 2);
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -413,7 +413,7 @@ namespace tut
 	{
 	  U32 binData[] = {9,8,7,6,5,4,3,2,1};
 
-	  addValue(messageBlockData, "testBinData", &binData, MVT_VARIABLE, sizeof(binData) >> 2, 4);
+	  addValue(messageBlockData, (char *)"testBinData", &binData, MVT_VARIABLE, sizeof(binData) >> 2, 4);
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -433,7 +433,7 @@ namespace tut
 	{
 	  U8 data = 0xa5;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_U8, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_U8, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -450,7 +450,7 @@ namespace tut
 	{
 	  U16 data = 0xa55a;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_U16, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_U16, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -467,7 +467,7 @@ namespace tut
 	{
 	  U32 data = 0xa55a7117;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_U32, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_U32, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -483,7 +483,7 @@ namespace tut
 	void LLSDMessageBuilderTestObject::test<27>()
 	{
 	  U64 data = U64L(0xa55a711711223344);
-	  addValue(messageBlockData, "testBinData", &data, MVT_U64, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_U64, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -500,7 +500,7 @@ namespace tut
 	{
 	  S8 data = -31;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_S8, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_S8, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -517,7 +517,7 @@ namespace tut
 	{
 	  S16 data = -31;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_S16, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_S16, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -534,7 +534,7 @@ namespace tut
 	{
 	  S32 data = -3100;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_S32, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_S32, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -551,7 +551,7 @@ namespace tut
 	{
 	  S64 data = -31003100;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_S64, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_S64, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -568,7 +568,7 @@ namespace tut
 	{
 	  F32 data = 1234.1234f;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_F32, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_F32, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -585,7 +585,7 @@ namespace tut
 	{
 	  F64 data = 1234.1234;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_F64, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_F64, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -602,7 +602,7 @@ namespace tut
 	{
 	  LLVector3 data(1,2,3);
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_LLVector3, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_LLVector3, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -619,7 +619,7 @@ namespace tut
 	{
 	  LLVector3d data(1,2,3);
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_LLVector3d, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_LLVector3d, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -637,7 +637,7 @@ namespace tut
 	  LLVector4 data(1,2,3,4);
 	  LLSD v = ll_sd_from_vector4(data);
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_LLVector4, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_LLVector4, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -657,7 +657,7 @@ namespace tut
 	  //we send a quaternion packed into a vec3 (w is infered) - so sizeof(vec) == 12 bytes not 16.
 	  LLVector3 vec = data.packToVector3();
 
-	  addValue(messageBlockData, "testBinData", &vec, MVT_LLQuaternion, sizeof(vec));
+	  addValue(messageBlockData, (char *)"testBinData", &vec, MVT_LLQuaternion, sizeof(vec));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -674,7 +674,7 @@ namespace tut
 	{
 	  LLUUID data("01234567-0123-0123-0123-234567abcdef");
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_LLUUID, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_LLUUID, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -696,8 +696,8 @@ namespace tut
 
 	  LLMsgData* md = new LLMsgData("testMessage");
 	  LLMsgBlkData* mbd = new LLMsgBlkData("testBlock", 0);
-	  addValue(mbd, "testBoolFalse", &valueFalse, MVT_BOOL, sizeof(BOOL));
-	  addValue(mbd, "testBoolTrue", &valueTrue, MVT_BOOL, sizeof(BOOL));
+	  addValue(mbd, (char *)"testBoolFalse", &valueFalse, MVT_BOOL, sizeof(BOOL));
+	  addValue(mbd, (char *)"testBoolTrue", &valueTrue, MVT_BOOL, sizeof(BOOL));
 	  md->addBlock(mbd);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -715,7 +715,7 @@ namespace tut
 	  U32 data(0xff887766);
 	  LLSD v = ll_sd_from_ipaddr(data);
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_IP_ADDR, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_IP_ADDR, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -732,7 +732,7 @@ namespace tut
 	{
 	  U16 data = 0xff88;
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_IP_PORT, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_IP_PORT, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -749,7 +749,7 @@ namespace tut
 	{
 	  U16 data[3] = {0,1,2};
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_U16Vec3, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_U16Vec3, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -769,7 +769,7 @@ namespace tut
 	{
 	  U16 data[4] = {0,1,2,4};
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_U16Quat, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_U16Quat, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();
 	  
@@ -789,7 +789,7 @@ namespace tut
 	{
 	  S16 data[19] = {0,-1,2,-4,5,-6,7,-8,9,-10,11,-12,13,-14,15,16,17,18};
 
-	  addValue(messageBlockData, "testBinData", &data, MVT_S16Array, sizeof(data));
+	  addValue(messageBlockData, (char *)"testBinData", &data, MVT_S16Array, sizeof(data));
 	  messageData->addBlock(messageBlockData);
 	  LLSDMessageBuilder builder = defaultBuilder();