From f190e6cfb1f16b5216984bb5a8fec85eb74d241f Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 9 Aug 2012 11:15:15 +0000 Subject: [PATCH] Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3 --- src/DriverMED/DriverMED_Family.cxx | 6 +++--- src/DriverMED/Makefile.am | 10 +++------- src/SMESHClient/Makefile.am | 5 ++--- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx index c284b0b3c..4d9a984d6 100644 --- a/src/DriverMED/DriverMED_Family.cxx +++ b/src/DriverMED/DriverMED_Family.cxx @@ -357,9 +357,9 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper, string aValue = aStr.str(); // PAL19785,0019867 - med forbids whitespace to be the last char in the name int maxSize; - if ( theWrapper->GetVersion() == MED::eV2_1 ) - maxSize = MED::GetNOMLength(); - else + //if ( theWrapper->GetVersion() == MED::eV2_1 ) + // maxSize = MED::GetNOMLength(); + //else maxSize = MED::GetNOMLength(); int lastCharPos = min( maxSize, (int) aValue.size() ) - 1; while ( isspace( aValue[ lastCharPos ] )) diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am index 898952af7..0e6d83571 100644 --- a/src/DriverMED/Makefile.am +++ b/src/DriverMED/Makefile.am @@ -15,15 +15,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# # SMESH DriverMED : driver to read and write 'med' files # File : Makefile.in # Author : Marc Tajchman (CEA) # Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH -# $Header$ -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files @@ -62,7 +60,7 @@ libMeshDriverMED_la_CPPFLAGS = \ libMeshDriverMED_la_LDFLAGS = \ $(BOOST_LIBS) \ ../Driver/libMeshDriver.la \ - $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 + $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 MED_Test_CPPFLAGS = \ @@ -80,6 +78,4 @@ MED_Test_LDADD = \ $(MED_LDFLAGS) \ -lMEDWrapper \ -lMEDWrapperBase \ - -lMEDWrapper_V2_2 \ - -lMEDWrapper_V2_1 - + -lMEDWrapper_V2_2 diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am index 86fd92dc0..d89d95fa1 100644 --- a/src/SMESHClient/Makefile.am +++ b/src/SMESHClient/Makefile.am @@ -15,14 +15,13 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# # GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client # File : Makefile.in # Author : Pavel TELKOV (OCC) # Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SHESM -# + include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files @@ -69,7 +68,7 @@ libSMESHClient_la_LDFLAGS = \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \ -lSalomeIDLKernel -lSALOMELocalTrace \ $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \ - $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \ + $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \ $(CAS_KERNEL) SMESHClientBin_CPPFLAGS = \ -- 2.39.2