update of test

[modules/kernel.git] / src / HDFPersist / HDFdatasetWrite.c

diff --git a/src/HDFPersist/HDFdatasetWrite.c b/src/HDFPersist/HDFdatasetWrite.c
index 3dea8c5f5c20d9109343b3d4a54e78307d1747ce..f2d45500cb8d2842e5116756bd780a4a0cb181b0 100644 (file)
--- a/src/HDFPersist/HDFdatasetWrite.c
+++ b/src/HDFPersist/HDFdatasetWrite.c
@@ -1,21 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-//           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+// Copyright (C) 2007-2011  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
+//
 // 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 
+// 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 
+//
+// 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 
+//
+// 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
-// 
+//
+
 /*----------------------------------------------------------------------------
 SALOME HDFPersist : implementation of HDF persitent ( save/ restore )
   File   : HDFdatasetWrite.c
@@ -23,6 +27,7 @@ SALOME HDFPersist : implementation of HDF persitent ( save/ restore )
 ----------------------------------------------------------------------------*/
 
 #include "hdfi.h"
+#include <stdlib.h>
 
 /*
  * - Name : _MEDdatasetWrite
@@ -38,7 +43,7 @@ hdf_err HDFdatasetWrite(hdf_idt id, void *val)
 {
   hdf_idt datatype;
   hdf_err ret;
-#ifdef PCLINUX
+#if defined (PCLINUX) || defined (PCLINUX64)
   int isI32BE = 0;
   int size = 0;
 #endif
@@ -46,7 +51,7 @@ hdf_err HDFdatasetWrite(hdf_idt id, void *val)
   if ((datatype = H5Dget_type(id)) < 0)
     return -1;
 
-#ifdef PCLINUX
+#if defined (PCLINUX) || defined (PCLINUX64)
   if((H5Tget_class(datatype) == H5T_INTEGER) && (H5Tget_size(datatype) == 4)) {
     isI32BE = 1; /* See HDFdatasetCreate */
 
@@ -55,8 +60,8 @@ hdf_err HDFdatasetWrite(hdf_idt id, void *val)
     if(ndim < 0) return -1;
     
     hdf_size *dim = (hdf_size *) malloc(sizeof(hdf_size)*ndim);
-    if ((ret == HDFdatasetGetDim(id, dim)) < 0)  return -1;
-       
+    if ((ret = HDFdatasetGetDim(id, dim)) < 0)  return -1;
+        
     for(i=0; i<ndim; i++) size+=dim[i];    
     free(dim);
     /*SRN : end of the fix */
@@ -71,7 +76,7 @@ hdf_err HDFdatasetWrite(hdf_idt id, void *val)
   if ((ret = H5Dwrite(id, datatype, H5S_ALL, H5S_ALL, H5P_DEFAULT, val)) < 0) 
     return -1;
 
-#ifdef PCLINUX
+#if defined (PCLINUX) || defined (PCLINUX64)
   if (isI32BE && (H5Tconvert(H5T_STD_I32BE, H5T_NATIVE_INT, size, (void *)val, NULL, (hid_t)0) < 0)) 
     return -1;
 #endif