From: ana Date: Thu, 7 May 2015 14:06:54 +0000 (+0300) Subject: Porting on Windows X-Git-Tag: V7_6_0rc1~9 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=cecb0a702d6468e20a75ea2d7dfed06113d4e1d6;p=modules%2Fsmesh.git Porting on Windows --- diff --git a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx index fd805dc9f..b5a4e088e 100644 --- a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx +++ b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx @@ -140,7 +140,12 @@ static std::string DATAFILE("data.txt"); static std::string SCRIPTFILE("padder.sh"); static std::string SEPARATOR(" "); +#ifdef WIN32 +static std::string USER(getenv("USERNAME")); +#else static std::string USER(getenv("USER")); +#endif + static std::string LOCAL_INPUTDIR("/tmp/spadder.local.inputdir."+USER); static std::string LOCAL_RESULTDIR("/tmp/spadder.local.resultdir."+USER); static std::string REMOTE_WORKDIR("/tmp/spadder.remote.workdir."+USER); @@ -685,6 +690,7 @@ char* MeshJobManager_i::getLastErrorMessage() { // extern "C" { + MESHJOBMANAGERENGINE_EXPORT PortableServer::ObjectId * MeshJobManagerEngine_factory( CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, PortableServer::ObjectId * contId,