X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHDFPersist%2FHDFattrWrite.c;h=90ba842f17ec6f9fb5c32328453f3e1e158de4ad;hb=54c311c4540ce9169bcb2d291f27d222162a04f0;hp=faac557fc985a1ac19f7dcd51944dc8d5af46be1;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git diff --git a/src/HDFPersist/HDFattrWrite.c b/src/HDFPersist/HDFattrWrite.c index faac557fc..90ba842f1 100644 --- a/src/HDFPersist/HDFattrWrite.c +++ b/src/HDFPersist/HDFattrWrite.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-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 +// // 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 : HDFattrWrite.c @@ -38,17 +42,17 @@ hdf_err HDFattrWrite(hdf_idt id, void *val) { hdf_idt type_id; int ret = 0; -#ifdef PCLINUX +#if defined (PCLINUX) || defined (PCLINUX64) int isI32BE = 0; #endif if ((type_id = H5Aget_type(id)) < 0) return -1; -#ifdef PCLINUX +#if defined (PCLINUX) || defined (PCLINUX64) if((H5Tget_class(type_id) == H5T_INTEGER) && (H5Tget_size(type_id) == 4)) { isI32BE = 1; /* See HDFattrCreate */ - if (H5Tconvert(H5T_NATIVE_INT,H5T_STD_I32BE,1,(void *)val,NULL,NULL) < 0) + if (H5Tconvert(H5T_NATIVE_INT,H5T_STD_I32BE,1,(void *)val,NULL,(hid_t)0) < 0) return -1; } #endif @@ -56,8 +60,8 @@ hdf_err HDFattrWrite(hdf_idt id, void *val) ret = H5Awrite(id,type_id, val); -#ifdef PCLINUX - if (isI32BE && (H5Tconvert(H5T_STD_I32BE,H5T_NATIVE_INT,1,(void *)val,NULL,NULL) < 0)) +#if defined (PCLINUX) || defined (PCLINUX64) + if (isI32BE && (H5Tconvert(H5T_STD_I32BE,H5T_NATIVE_INT,1,(void *)val,NULL,(hid_t)0) < 0)) return -1; #endif