[Bf-committers] problems with el'beem on msvc6

bjornmose bjornmose at gmx.net
Fri Apr 14 00:22:41 CEST 2006


hi nils,
yah i am masochist .. so i did try to make it compile with msvc6
works pretty fine but stumbles on some std:: while beeing in 'std' name 
space already. May be you can have a look at if 'em "std::" are reallly 
needed .. otherways i could even maintain el'beem support on msvc6
:) / me smiles :) even more .. 'think it would be nice
BM


cvs diff intern\elbeem\intern\elbeem.cpp 
intern\elbeem\intern\particletracer.h 
intern\elbeem\intern\simulation_object.cpp 
intern\elbeem\intern\solver_interface.h (in directory G:\bf_msvc6\blender\)
Index: intern/elbeem/intern/elbeem.cpp
===================================================================
RCS file: /cvsroot/bf-blender/blender/intern/elbeem/intern/elbeem.cpp,v
retrieving revision 1.6
diff -r1.6 elbeem.cpp
144,145c144,145
< 	if(mesh->name) obj->setName(std::string(mesh->name));
< 	else obj->setName(std::string("[unnamed]"));
---
 > 	if(mesh->name) obj->setName(string(mesh->name));
 > 	else obj->setName(string("[unnamed]"));
Index: intern/elbeem/intern/particletracer.h
===================================================================
RCS file: 
/cvsroot/bf-blender/blender/intern/elbeem/intern/particletracer.h,v
retrieving revision 1.4
diff -r1.4 particletracer.h
168,169c168,169
< 		inline void setDumpTextFile(std::string set) { mDumpTextFile = set; }
< 		inline std::string getDumpTextFile()         { return mDumpTextFile; }
---
 > 		inline void setDumpTextFile(string set) { mDumpTextFile = set; }
 > 		inline string getDumpTextFile()         { return mDumpTextFile; }
217c217
< 		std::string mDumpTextFile;
---
 > 		string mDumpTextFile;
Index: intern/elbeem/intern/simulation_object.cpp
===================================================================
RCS file: 
/cvsroot/bf-blender/blender/intern/elbeem/intern/simulation_object.cpp,v
retrieving revision 1.6
diff -r1.6 simulation_object.cpp
170,173c170,173
< 		string dinitType = std::string("no");
< 		if     (mpElbeemSettings->obstacleType==FLUIDSIM_OBSTACLE_PARTSLIP) 
dinitType = std::string("part");
< 		else if(mpElbeemSettings->obstacleType==FLUIDSIM_OBSTACLE_FREESLIP) 
dinitType = std::string("free");
< 		else 
/*if(mpElbeemSettings->obstacleType==FLUIDSIM_OBSTACLE_NOSLIP)*/ 
dinitType = std::string("no");
---
 > 		string dinitType = string("no");
 > 		if     (mpElbeemSettings->obstacleType==FLUIDSIM_OBSTACLE_PARTSLIP) 
dinitType = string("part");
 > 		else if(mpElbeemSettings->obstacleType==FLUIDSIM_OBSTACLE_FREESLIP) 
dinitType = string("free");
 > 		else 
/*if(mpElbeemSettings->obstacleType==FLUIDSIM_OBSTACLE_NOSLIP)*/ 
dinitType = string("no");
Index: intern/elbeem/intern/solver_interface.h
===================================================================
RCS file: 
/cvsroot/bf-blender/blender/intern/elbeem/intern/solver_interface.h,v
retrieving revision 1.4
diff -r1.4 solver_interface.h
380,381c380,381
< 		inline void setDomainBound(std::string set)	{ mDomainBound = set; }
< 		inline std::string getDomainBound() const	{ return mDomainBound; }
---
 > 		inline void setDomainBound(string set)	{ mDomainBound = set; }
 > 		inline string getDomainBound() const	{ return mDomainBound; }
560c560
< 		std::string mDomainBound;
---
 > 		string mDomainBound;

***** CVS exited normally with code 1 *****




More information about the Bf-committers mailing list