[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12014] trunk/blender/intern/elbeem/intern : apply first part of patch #6994 - elbeem_warning_patch.diff

[Stephen Swaney]

Revision: 12014
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12014
Author:   stiv
Date:     2007-09-12 03:01:15 +0200 (Wed, 12 Sep 2007)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/elbeem/intern/elbeem.h
    trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp
    trunk/blender/intern/elbeem/intern/ntl_vector3dim.h
    trunk/blender/intern/elbeem/intern/parametrizer.cpp
    trunk/blender/intern/elbeem/intern/solver_interface.cpp
    trunk/blender/intern/elbeem/intern/utilities.cpp
    trunk/blender/intern/elbeem/intern/utilities.h

Modified: trunk/blender/intern/elbeem/intern/elbeem.h
===================================================================
--- trunk/blender/intern/elbeem/intern/elbeem.h	2007-09-11 20:58:00 UTC (rev 12013)
+++ trunk/blender/intern/elbeem/intern/elbeem.h	2007-09-12 01:01:15 UTC (rev 12014)
@@ -154,7 +154,7 @@
 	short volumeInitType;
 
 	/* name of the mesh, mostly for debugging */
-	char *name;
+	const char *name;
 } elbeemMesh;
 
 // API functions

Modified: trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp	2007-09-11 20:58:00 UTC (rev 12013)
+++ trunk/blender/intern/elbeem/intern/ntl_geometryobject.cpp	2007-09-12 01:01:15 UTC (rev 12014)
@@ -83,7 +83,7 @@
 /* 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",

Modified: trunk/blender/intern/elbeem/intern/ntl_vector3dim.h
===================================================================
--- trunk/blender/intern/elbeem/intern/ntl_vector3dim.h	2007-09-11 20:58:00 UTC (rev 12013)
+++ trunk/blender/intern/elbeem/intern/ntl_vector3dim.h	2007-09-12 01:01:15 UTC (rev 12014)
@@ -202,7 +202,7 @@
 
 
 //! 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

Modified: trunk/blender/intern/elbeem/intern/parametrizer.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/parametrizer.cpp	2007-09-11 20:58:00 UTC (rev 12013)
+++ trunk/blender/intern/elbeem/intern/parametrizer.cpp	2007-09-12 01:01:15 UTC (rev 12014)
@@ -14,7 +14,7 @@
 #define DEBUG_PARAMCHANNELS 0
 
 /*! param seen debug string array */
-char *ParamStrings[] = {
+const char *ParamStrings[] = {
 	"RelaxTime",
 	"Reynolds",
 	"Viscosity",

Modified: trunk/blender/intern/elbeem/intern/solver_interface.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/solver_interface.cpp	2007-09-11 20:58:00 UTC (rev 12013)
+++ trunk/blender/intern/elbeem/intern/solver_interface.cpp	2007-09-12 01:01:15 UTC (rev 12014)
@@ -187,7 +187,7 @@
 	// 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"; }

Modified: trunk/blender/intern/elbeem/intern/utilities.cpp
===================================================================
--- trunk/blender/intern/elbeem/intern/utilities.cpp	2007-09-11 20:58:00 UTC (rev 12013)
+++ trunk/blender/intern/elbeem/intern/utilities.cpp	2007-09-12 01:01:15 UTC (rev 12014)
@@ -56,7 +56,7 @@
 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 @@
 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

Modified: trunk/blender/intern/elbeem/intern/utilities.h
===================================================================
--- trunk/blender/intern/elbeem/intern/utilities.h	2007-09-11 20:58:00 UTC (rev 12013)
+++ trunk/blender/intern/elbeem/intern/utilities.h	2007-09-12 01:01:15 UTC (rev 12014)
@@ -50,7 +50,7 @@
 int  isSimworldOk(void);
 
 // access elbeem simulator error string
-void setElbeemErrorString(char* set);
+void setElbeemErrorString(const char* set);
 char* getElbeemErrorString(void);