Merge from V6_main_20120808 08Aug12

[modules/med.git] / src / MEDMEM_I / MEDMEM_TraitsForFields.hxx

diff --git a/src/MEDMEM_I/MEDMEM_TraitsForFields.hxx b/src/MEDMEM_I/MEDMEM_TraitsForFields.hxx
index 2d57564baccbfec434f0935acd6771565102f90d..ceb82ee80e1cd23aaed5ad5d70ff491b4b8e8ac3 100644 (file)
--- a/src/MEDMEM_I/MEDMEM_TraitsForFields.hxx
+++ b/src/MEDMEM_I/MEDMEM_TraitsForFields.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
 //
-//  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.
+// 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.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef __MEDMEM_TRAITSFORFIELDS_HXX__
 #define __MEDMEM_TRAITSFORFIELDS_HXX__
 
@@ -48,8 +49,8 @@ struct FIELDI_TRAITS<double, FullInterlace>
   typedef SALOME_MED::FIELDDOUBLEFULL_ptr FieldCorbaPtrType;
   typedef SALOME_MED::FIELDDOUBLE_ptr SimpleFieldCorbaPtrType;
   typedef SALOME_MED::FIELDDOUBLE SimpleFieldGlobalType;
-  typedef SALOME_MED::double_array SeqType;
-  typedef SALOME_MED::double_array_var SeqVarType;
+  typedef SALOME_TYPES::ListOfDouble SeqType;
+  typedef SALOME_TYPES::ListOfDouble_var SeqVarType;
   typedef SALOME::SenderDouble_ptr SenderPtrType;
   typedef SALOME::SenderDouble_var SenderVarType;
 };
@@ -61,8 +62,8 @@ struct FIELDI_TRAITS<double, NoInterlace>
   typedef SALOME_MED::FIELDDOUBLENO_ptr FieldCorbaPtrType;
   typedef SALOME_MED::FIELDDOUBLE_ptr SimpleFieldCorbaPtrType;
   typedef SALOME_MED::FIELDDOUBLE SimpleFieldGlobalType;
-  typedef SALOME_MED::double_array SeqType;
-  typedef SALOME_MED::double_array_var SeqVarType;
+  typedef SALOME_TYPES::ListOfDouble SeqType;
+  typedef SALOME_TYPES::ListOfDouble_var SeqVarType;
   typedef SALOME::SenderDouble_ptr SenderPtrType;
   typedef SALOME::SenderDouble_var SenderVarType;
 };
@@ -74,8 +75,8 @@ struct FIELDI_TRAITS<double, NoInterlaceByType>
   typedef SALOME_MED::FIELDDOUBLENOBYTYPE_ptr FieldCorbaPtrType;
   typedef SALOME_MED::FIELDDOUBLE_ptr SimpleFieldCorbaPtrType;
   typedef SALOME_MED::FIELDDOUBLE SimpleFieldGlobalType;
-  typedef SALOME_MED::double_array SeqType;
-  typedef SALOME_MED::double_array_var SeqVarType;
+  typedef SALOME_TYPES::ListOfDouble SeqType;
+  typedef SALOME_TYPES::ListOfDouble_var SeqVarType;
   typedef SALOME::SenderDouble_ptr SenderPtrType;
   typedef SALOME::SenderDouble_var SenderVarType;
 };
@@ -87,8 +88,8 @@ struct FIELDI_TRAITS<int, FullInterlace>
   typedef SALOME_MED::FIELDINTFULL_ptr FieldCorbaPtrType;
   typedef SALOME_MED::FIELDINT_ptr SimpleFieldCorbaPtrType;
   typedef SALOME_MED::FIELDINT SimpleFieldGlobalType;
-  typedef SALOME_MED::long_array SeqType;
-  typedef SALOME_MED::long_array_var SeqVarType;
+  typedef SALOME_TYPES::ListOfLong SeqType;
+  typedef SALOME_TYPES::ListOfLong_var SeqVarType;
   typedef SALOME::SenderInt_ptr SenderPtrType;
   typedef SALOME::SenderInt_var SenderVarType;
 };
@@ -100,8 +101,8 @@ struct FIELDI_TRAITS<int, NoInterlace>
   typedef SALOME_MED::FIELDINTNO_ptr FieldCorbaPtrType;
   typedef SALOME_MED::FIELDINT_ptr SimpleFieldCorbaPtrType;
   typedef SALOME_MED::FIELDINT SimpleFieldGlobalType;
-  typedef SALOME_MED::long_array SeqType;
-  typedef SALOME_MED::long_array_var SeqVarType;
+  typedef SALOME_TYPES::ListOfLong SeqType;
+  typedef SALOME_TYPES::ListOfLong_var SeqVarType;
   typedef SALOME::SenderInt_ptr SenderPtrType;
   typedef SALOME::SenderInt_var SenderVarType;
 };
@@ -113,8 +114,8 @@ struct FIELDI_TRAITS<int, NoInterlaceByType>
   typedef SALOME_MED::FIELDINTNOBYTYPE_ptr FieldCorbaPtrType;
   typedef SALOME_MED::FIELDINT_ptr SimpleFieldCorbaPtrType;
   typedef SALOME_MED::FIELDINT SimpleFieldGlobalType;
-  typedef SALOME_MED::long_array SeqType;
-  typedef SALOME_MED::long_array_var SeqVarType;
+  typedef SALOME_TYPES::ListOfLong SeqType;
+  typedef SALOME_TYPES::ListOfLong_var SeqVarType;
   typedef SALOME::SenderInt_ptr SenderPtrType;
   typedef SALOME::SenderInt_var SenderVarType;
 };