apply first part of patch #6994 - elbeem_warning_patch.diff

Fixing warnings: conversion from string constant to char *
This should make gcc 4.1.x a little happier.

7 files changed, 8 insertions, 8 deletions

diff --git a/intern/elbeem/intern/elbeem.h b/intern/elbeem/intern/elbeem.h
index b3feda8bbe8..2a594dd07e6 100644
--- a/intern/elbeem/intern/elbeem.h
+++ b/intern/elbeem/intern/elbeem.h
@@ -154,7 +154,7 @@ typedef struct elbeemMesh {
 	short volumeInitType;
 
 	/* name of the mesh, mostly for debugging */
-	char *name;
+	const char *name;
 } elbeemMesh;
 
 // API functions
diff --git a/intern/elbeem/intern/ntl_geometryobject.cpp b/intern/elbeem/intern/ntl_geometryobject.cpp
index bc004b656f5..f2ebd572682 100644
--- a/intern/elbeem/intern/ntl_geometryobject.cpp
+++ b/intern/elbeem/intern/ntl_geometryobject.cpp
@@ -83,7 +83,7 @@ bool ntlGeometryObject::checkIsAnimated() {
 /* Init attributes etc. of this object */
 /*****************************************************************************/
 #define GEOINIT_STRINGS  9
-static char *initStringStrs[GEOINIT_STRINGS] = {
+static const char *initStringStrs[GEOINIT_STRINGS] = {
 	"fluid",
 	"bnd_no","bnd_noslip",
 	"bnd_free","bnd_freeslip",
diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h
index d6a7557f69d..912a37350c1 100644
--- a/intern/elbeem/intern/ntl_vector3dim.h
+++ b/intern/elbeem/intern/ntl_vector3dim.h
@@ -202,7 +202,7 @@ private:
 
 
 //! global string for formatting vector output in utilities.cpp
-extern char *globVecFormatStr;
+extern const char *globVecFormatStr;
 
 /*************************************************************************
   Outputs the object in human readable form using the format
diff --git a/intern/elbeem/intern/parametrizer.cpp b/intern/elbeem/intern/parametrizer.cpp
index 0bbdc2ee363..dca0b48d265 100644
--- a/intern/elbeem/intern/parametrizer.cpp
+++ b/intern/elbeem/intern/parametrizer.cpp
@@ -14,7 +14,7 @@
 #define DEBUG_PARAMCHANNELS 0
 
 /*! param seen debug string array */
-char *ParamStrings[] = {
+const char *ParamStrings[] = {
 	"RelaxTime",
 	"Reynolds",
 	"Viscosity",
diff --git a/intern/elbeem/intern/solver_interface.cpp b/intern/elbeem/intern/solver_interface.cpp
index b50e409bce5..2539556617b 100644
--- a/intern/elbeem/intern/solver_interface.cpp
+++ b/intern/elbeem/intern/solver_interface.cpp
@@ -187,7 +187,7 @@ void calculateMemreqEstimate( int resx,int resy,int resz,
 	// cpdata init check missing...
 
 	double memd = memCnt;
-	char *sizeStr = "";
+	const char *sizeStr = "";
 	const double sfac = 1024.0;
 	if(memd>sfac){ memd /= sfac; sizeStr="KB"; }
 	if(memd>sfac){ memd /= sfac; sizeStr="MB"; }
diff --git a/intern/elbeem/intern/utilities.cpp b/intern/elbeem/intern/utilities.cpp
index 209d0cf69a5..332052e91b6 100644
--- a/intern/elbeem/intern/utilities.cpp
+++ b/intern/elbeem/intern/utilities.cpp
@@ -56,7 +56,7 @@ int  isSimworldOk(void) {
 char gElbeemErrorString[256] = {'-','\0' };
 
 // access elbeem simulator error string
-void setElbeemErrorString(char* set) {
+void setElbeemErrorString(const char* set) {
 	strncpy(gElbeemErrorString, set, 256);
 }
 char* getElbeemErrorString(void) { return gElbeemErrorString; }
@@ -77,7 +77,7 @@ int globalFirstEnvCheck = 0;
 void resetGlobalColorSetting() { globalColorSetting = DEF_globalColorSetting; }
 
 // global string for formatting vector output, TODO test!?
-char *globVecFormatStr = "V[%f,%f,%f]";
+const char *globVecFormatStr = "V[%f,%f,%f]";
 
 
 // global mp on/off switch
diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h
index e5e02be331d..0f65408d23c 100644
--- a/intern/elbeem/intern/utilities.h
+++ b/intern/elbeem/intern/utilities.h
@@ -50,7 +50,7 @@ int  getElbeemState(void);
 int  isSimworldOk(void);
 
 // access elbeem simulator error string
-void setElbeemErrorString(char* set);
+void setElbeemErrorString(const char* set);
 char* getElbeemErrorString(void);