Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3

diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx
index c284b0b3ca8f3e7315eaa5eb97360d222c57931c..4d9a984d6aef9d8ebc3bad6b7482920ee57477fd 100644 (file)
--- 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<MED::eV2_1>();
-  else
+  //if ( theWrapper->GetVersion() == MED::eV2_1 )
+  //  maxSize = MED::GetNOMLength<MED::eV2_1>();
+  //else
     maxSize = MED::GetNOMLength<MED::eV2_2>();
   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 898952af77ff2948b7bfdc21933b42eb1f692ac8..0e6d83571d93e754605fe18c5f8180b48c551076 100644 (file)
--- 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 86fd92dc0a027aa6fca3e3c4c0c2d397da0e226b..d89d95fa1abc582acc3eaf0fe9a092764022a5fc 100644 (file)
--- 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 = \