Index: cego/src/CegoContentObject.cc
--- cego/src/CegoContentObject.cc.orig	2007-09-10 08:36:41 +0200
+++ cego/src/CegoContentObject.cc	2008-04-28 08:15:14 +0200
@@ -277,7 +277,7 @@
 	s += Chain("   TableName: ")  + pF->getTableName() + Chain("\n");
 	s += Chain("   TableAlias: ") + pF->getTableAlias() + Chain("\n");
 	s += Chain("   AttrName: ") + pF->getAttrName() + Chain("\n");
-	s += Chain("   Type: ") +  CEGO_TYPE_MAP[pF->getFieldValue().getType()] + Chain("\n");
+	s += Chain("   Type: ") +  CEGO_TYPE_MAP[pF->getFieldValue().getType()].c_str() + Chain("\n");
 	s += Chain("   Len: ") + Chain(pF->getFieldValue().getLength()) + Chain("\n");
 	
 	pF= _schema.Next();
Index: cego/src/CegoDataType.h
--- cego/src/CegoDataType.h.orig	2007-12-16 12:01:09 +0100
+++ cego/src/CegoDataType.h	2008-04-28 08:15:14 +0200
@@ -54,7 +54,7 @@
 
 // this must be correlated to the enum above 
 
-static char *CEGO_TYPE_MAP[] =
+static const string CEGO_TYPE_MAP[] =
 {
     "int",
     "long",
Index: cego/src/CegoOutput.cc
--- cego/src/CegoOutput.cc.orig	2007-12-02 14:59:34 +0100
+++ cego/src/CegoOutput.cc	2008-04-28 08:15:14 +0200
@@ -35,6 +35,7 @@
 
 #include "Datetime.h"
 #include "XMLSuite.h"
+#include "CegoDefs.h"
 #include "CegoOutput.h"
 #include "CegoDefs.h"
 
Index: cego/src/CegoProcedure.cc
--- cego/src/CegoProcedure.cc.orig	2007-09-21 19:06:07 +0200
+++ cego/src/CegoProcedure.cc	2008-04-28 08:15:14 +0200
@@ -113,10 +113,10 @@
 		if ( fv.castTo(pVar->getValue().getType()) == false )
 		{
 		    throw Exception(EXLOC, Chain("Mismatched datatype <") 
-				    + CEGO_TYPE_MAP[(int)fv.getType()] 
+				    + CEGO_TYPE_MAP[(int)fv.getType()].c_str()
 				    + Chain("> in value list for argument ") + Chain(pos) 
 				    + " ( expected " 
-				    + CEGO_TYPE_MAP[(int)pVar->getValue().getType()] + " )");
+				    + CEGO_TYPE_MAP[(int)pVar->getValue().getType()].c_str() + " )");
 		}
 	    }
 	    
Index: cego/src/CegoQuery.cc
--- cego/src/CegoQuery.cc.orig	2008-03-04 17:39:21 +0100
+++ cego/src/CegoQuery.cc	2008-04-28 08:15:14 +0200
@@ -278,10 +278,10 @@
 	if ( fv.castTo(pFV->getFieldValue().getType()) == false )
 	{
 	    throw Exception(EXLOC, Chain("Mismatched datatype <") 
-			    + CEGO_TYPE_MAP[(int)fv.getType()] 
+			    + CEGO_TYPE_MAP[(int)fv.getType()].c_str()
 			    + Chain("> in value list for argument ") + Chain(pos) 
 			    + " ( expected " 
-			    + CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()] + " )");
+			    + CEGO_TYPE_MAP[(int)pFV->getFieldValue().getType()].c_str()+ " )");
 	}
     }
 
Index: cego/src/CegoQuery.h
--- cego/src/CegoQuery.h.orig	2007-11-17 20:09:17 +0100
+++ cego/src/CegoQuery.h	2008-04-28 08:15:14 +0200
@@ -57,7 +57,7 @@
    
     ~CegoQuery();
 
-    void CegoQuery::setBlock(CegoProcBlock *pBlock);
+    void setBlock(CegoProcBlock *pBlock);
 
     void execute(CegoProcBlock* pBlock = 0);
 
Index: cego/src/CegoQueryHelper.cc
--- cego/src/CegoQueryHelper.cc.orig	2007-11-03 14:17:20 +0100
+++ cego/src/CegoQueryHelper.cc	2008-04-28 08:15:14 +0200
@@ -663,7 +663,7 @@
 	    }
 	    default:
 	    {
-		Chain msg = Chain("Aggregation not supported on datatype <") + CEGO_TYPE_MAP[ (int) fv.getType()] + Chain(">");
+		Chain msg = Chain("Aggregation not supported on datatype <") + CEGO_TYPE_MAP[ (int) fv.getType()].c_str() + Chain(">");
 		throw Exception(EXLOC, msg);
 		break;
 	    }
Index: cego/src/CegoTableManager.cc
--- cego/src/CegoTableManager.cc.orig	2008-02-16 16:58:33 +0100
+++ cego/src/CegoTableManager.cc	2008-04-28 08:24:58 +0200
@@ -1864,10 +1864,10 @@
 	    if ( pD->getFieldValue().getType() != pF->getFieldValue().getType() )
 	    {
 		throw Exception(EXLOC, Chain("Mismatched data type <")
-				+ CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())] 
+				+ CEGO_TYPE_MAP[(int)(pD->getFieldValue().getType())].c_str()
 				+ Chain("> for attribute ") + pF->getAttrName() 
 				+ Chain(", expected type <")
-				+ CEGO_TYPE_MAP[(int)(pF->getFieldValue().getType())]
+				+ CEGO_TYPE_MAP[(int)(pF->getFieldValue().getType())].c_str()
 				+ Chain(">")); 
 
 	    }