Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8df43f2
)
untabify
author
eap
<eap@opencascade.com>
Thu, 16 May 2013 17:09:28 +0000
(17:09 +0000)
committer
eap
<eap@opencascade.com>
Thu, 16 May 2013 17:09:28 +0000
(17:09 +0000)
src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
patch
|
blob
|
history
src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
patch
|
blob
|
history
src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx
patch
|
blob
|
history
diff --git
a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
index c968033504043b3f1d59239be4edf79e265b1da7..b0c33b0b775557894a362a50f363e4c85ba5a753 100644
(file)
--- a/
src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
+++ b/
src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
@@
-295,9
+295,9
@@
CORBA::Long MeshJobManager_i::initialize(const MESHJOB::MeshJobParameterList & m
break;
default:
_lastErrorMessage =
break;
default:
_lastErrorMessage =
- std::string("The type of the file ")+
- std::string(currentMesh.file_name)+
- std::string(" is not recognized");
+
std::string("The type of the file ")+
+
std::string(currentMesh.file_name)+
+
std::string(" is not recognized");
LOG(_lastErrorMessage);
return JOBID_UNDEFINED;
}
LOG(_lastErrorMessage);
return JOBID_UNDEFINED;
}
@@
-573,8
+573,8
@@
MESHJOB::MeshJobResults * MeshJobManager_i::finalize(CORBA::Long jobId) {
if ( fexists( (local_resultdir+"/"+outputFileName).c_str() ) != true ) {
_lastErrorMessage = std::string("The result file ")+
if ( fexists( (local_resultdir+"/"+outputFileName).c_str() ) != true ) {
_lastErrorMessage = std::string("The result file ")+
- std::string((local_resultdir+"/"+outputFileName).c_str())+
- std::string(" has not been created.");
+
std::string((local_resultdir+"/"+outputFileName).c_str())+
+
std::string(" has not been created.");
result->status = false;
}
else {
result->status = false;
}
else {
diff --git
a/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
b/src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
index ac5921b5a3f02cd2704730ace7881a2cbeec817c..a8b270547daf29cd0d38229e041e4dca08ce0627 100644
(file)
--- a/
src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
+++ b/
src/Tools/padder/meshjob/impl/MeshJobManager_i.hxx
@@
-43,9
+43,9
@@
public:
~MeshJobManager_i();
bool configure (const char *configId,
~MeshJobManager_i();
bool configure (const char *configId,
- const MESHJOB::ConfigParameter & configParameter);
+
const MESHJOB::ConfigParameter & configParameter);
CORBA::Long initialize (const MESHJOB::MeshJobParameterList & meshJobParameterList,
CORBA::Long initialize (const MESHJOB::MeshJobParameterList & meshJobParameterList,
- const char *configId);
+
const char *configId);
bool start (CORBA::Long jobId);
char* getState (CORBA::Long jobId);
MESHJOB::MeshJobResults * finalize(CORBA::Long jobId);
bool start (CORBA::Long jobId);
char* getState (CORBA::Long jobId);
MESHJOB::MeshJobResults * finalize(CORBA::Long jobId);
diff --git
a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx
b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx
index d9950d0480e1f7eb03a0e6a6196253d69a7344d5..027685b0642fc39207579399f8e94d2f946e9880 100644
(file)
--- a/
src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx
+++ b/
src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.hxx
@@
-34,8
+34,8
@@
class SPADDERPluginTester_i:
{
public:
SPADDERPluginTester_i(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa,
{
public:
SPADDERPluginTester_i(CORBA::ORB_ptr orb, PortableServer::POA_ptr poa,
- PortableServer::ObjectId * contId,
- const char *instanceName, const char *interfaceName);
+
PortableServer::ObjectId * contId,
+
const char *instanceName, const char *interfaceName);
virtual ~SPADDERPluginTester_i();
void demo(CORBA::Double a,CORBA::Double b,CORBA::Double& c);
virtual ~SPADDERPluginTester_i();
void demo(CORBA::Double a,CORBA::Double b,CORBA::Double& c);