Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/V7_dev' into V8_0_0_BR
[modules/smesh.git]
/
src
/
MEDWrapper
/
Factory
/
MED_Factory.cxx
diff --git
a/src/MEDWrapper/Factory/MED_Factory.cxx
b/src/MEDWrapper/Factory/MED_Factory.cxx
index a1781441b6db4e795185906042bb1ae981696298..f4108be584cd1a671031c1d2b4def94335926624 100644
(file)
--- a/
src/MEDWrapper/Factory/MED_Factory.cxx
+++ b/
src/MEDWrapper/Factory/MED_Factory.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-18,17
+18,19
@@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include "MED_Factory.hxx"
#include "MED_Utilities.hxx"
#include "MED_V2_2_Wrapper.hxx"
#include <stdio.h>
#include "MED_Factory.hxx"
#include "MED_Utilities.hxx"
#include "MED_V2_2_Wrapper.hxx"
#include <stdio.h>
+#include <errno.h>
#include <sstream>
#include <sstream>
+#include <med.h>
extern "C"
{
extern "C"
{
-#include <med.h>
#ifndef WIN32
#include <unistd.h>
#endif
#ifndef WIN32
#include <unistd.h>
#endif
@@
-52,19
+54,20
@@
namespace MED
#ifndef WIN32
if (access(theFileName.c_str(),F_OK))
return aVersion;
#ifndef WIN32
if (access(theFileName.c_str(),F_OK))
return aVersion;
- if
(theDoPreCheckInSeparateProcess)
{
+ if
( theDoPreCheckInSeparateProcess )
{
// First check, is it possible to deal with the file
std::ostringstream aStr;
// File name is in quotes for the case of space(s) inside it (PAL13009)
// First check, is it possible to deal with the file
std::ostringstream aStr;
// File name is in quotes for the case of space(s) inside it (PAL13009)
- aStr<<"bash -c \""<<getenv("
MED
_ROOT_DIR")<<"/bin/salome/mprint_version \'"<<theFileName<<"\'\"";
+ aStr<<"bash -c \""<<getenv("
SMESH
_ROOT_DIR")<<"/bin/salome/mprint_version \'"<<theFileName<<"\'\"";
if(!MYDEBUG)
aStr<<" 2>&1 > /dev/null";
std::string aCommand = aStr.str();
int aStatus = system(aCommand.c_str());
if(!MYDEBUG)
aStr<<" 2>&1 > /dev/null";
std::string aCommand = aStr.str();
int aStatus = system(aCommand.c_str());
- BEGMSG(MYDEBUG,"aCommand = '"<<aCommand<<"'; aStatus = "<<aStatus<<std::endl);
- if(aStatus != 0)
+ BEGMSG( MYDEBUG,"aCommand = '" << aCommand << "'; aStatus = " << aStatus
+ << "; errno = " << errno << " = " << strerror( errno ) << std::endl );
+ if ( aStatus != 0 && errno != EAGAIN && errno != ENOMEM ) // "Cannot allocate memory" is OK
return aVersion;
}
#endif
return aVersion;
}
#endif