ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-16 13:13:08 +05:00
Code Issues Packages Projects Releases Wiki Activity

1) fix MeshJobManager_i.cxx:208: error: invalid conversion from 'const char*' to 'char*'

Browse Source 
2) untabify
This commit is contained in:
eap 2011-11-18 07:03:30 +00:00
parent f93b8b08cc
commit c20306b7e6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
View File

@ -58,7 +58,7 @@ static long timetag() {
* This function returns true if the string text starts with the string * This function returns true if the string text starts with the string
* token. * token.
*/ */
static bool myStartsWith(const std::string& text,const std::string& token){ static bool myStartsWith(const std::string& text,const std::string& token){
if(text.length() < token.length()) if(text.length() < token.length())
return false; return false;
return (text.compare(0, token.length(), token) == 0); return (text.compare(0, token.length(), token) == 0);
@ -164,11 +164,11 @@ const char * MeshJobManager_i::_writeDataFile(std::vector<MESHJOB::MeshJobParame
dataFile << line.c_str() << std::endl; dataFile << line.c_str() << std::endl;
for (int i=0; i<nbSteelBarMesh; i++) { for (int i=0; i<nbSteelBarMesh; i++) {
#ifdef WIN32 #ifdef WIN32
char fname[ _MAX_FNAME ]; char fname[ _MAX_FNAME ];
_splitpath( listSteelBarMesh[i].file_name, NULL, NULL, fname, NULL ); _splitpath( listSteelBarMesh[i].file_name, NULL, NULL, fname, NULL );
char* bname = &fname[0]; char* bname = &fname[0];
#else #else
char* bname = basename(listSteelBarMesh[i].file_name); char* bname = basename(listSteelBarMesh[i].file_name);
#endif #endif
line = std::string(bname) + " " + std::string(listSteelBarMesh[i].group_name); line = std::string(bname) + " " + std::string(listSteelBarMesh[i].group_name);
dataFile << line.c_str() << std::endl; dataFile << line.c_str() << std::endl;
@ -201,11 +201,11 @@ const char* MeshJobManager_i::_writeScriptFile(const char * dataFileName, const
char * envpath = _configMap[configId].envpath; char * envpath = _configMap[configId].envpath;
#ifdef WIN32 #ifdef WIN32
char fname[ _MAX_FNAME ]; char fname[ _MAX_FNAME ];
_splitpath( dataFileName, NULL, NULL, fname, NULL ); _splitpath( dataFileName, NULL, NULL, fname, NULL );
char* bname = &fname[0]; const char* bname = &fname[0];
#else #else
char* bname = basename(dataFileName); const char* bname = basename(dataFileName);
#endif #endif
@ -226,7 +226,7 @@ const char* MeshJobManager_i::_writeScriptFile(const char * dataFileName, const
// ==================================================================== // ====================================================================
// //
bool MeshJobManager_i::configure(const char *configId, bool MeshJobManager_i::configure(const char *configId,
const MESHJOB::ConfigParameter & configParameter) const MESHJOB::ConfigParameter & configParameter)
{ {
beginService("MeshJobManager_i::configure"); beginService("MeshJobManager_i::configure");
@ -244,7 +244,7 @@ long MeshJobManager_i::JOBID_UNDEFINED = -1;
/*! Initialize a smesh computation job and return the job identifier */ /*! Initialize a smesh computation job and return the job identifier */
CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobParameterList & meshJobParameterList, CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobParameterList & meshJobParameterList,
const char * configId) const char * configId)
{ {
beginService("MeshJobManager_i::initialize"); beginService("MeshJobManager_i::initialize");