Mercurial > forge

diff main/fixed/src/ov-fixed.cc @ 9931:58d36e8880db octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Description: Make the package compile against HDF5 1.8 Author: Rafael Laboissiere <rafael@laboissiere.net>
author jordigh
date Fri, 30 Mar 2012 15:59:45 +0000
parents d84d2fea3c90
children 2deb6b24d293
line wrap: on
line diff
--- a/main/fixed/src/ov-fixed.cc	Fri Mar 30 15:14:48 2012 +0000
+++ b/main/fixed/src/ov-fixed.cc	Fri Mar 30 15:59:45 2012 +0000
@@ -291,7 +291,7 @@
 octave_fixed::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
 {
   hid_t group_hid = -1;
-  group_hid = H5Gcreate (loc_id, name, 0);
+  group_hid = H5Gcreate (loc_id, name, 0, H5P_DEFAULT, H5P_DEFAULT);
   if (group_hid < 0 ) return false;
 
   hsize_t dims[3];
@@ -308,7 +308,7 @@
     }
 
   data_hid = H5Dcreate (group_hid, "int", H5T_NATIVE_UCHAR, space_hid, 
-			H5P_DEFAULT);
+			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -328,7 +328,7 @@
     }    
 
   data_hid = H5Dcreate (group_hid, "dec", H5T_NATIVE_UCHAR, space_hid, 
-			H5P_DEFAULT);
+			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -348,7 +348,7 @@
     }    
 
   data_hid = H5Dcreate (group_hid, "num", H5T_NATIVE_UINT, space_hid, 
-			H5P_DEFAULT);
+			H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -374,10 +374,10 @@
   hid_t group_hid, data_hid, space_id;
   hsize_t rank;
 
-  group_hid = H5Gopen (loc_id, name);
+  group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
   if (group_hid < 0 ) return false;
 
-  data_hid = H5Dopen (group_hid, "int");
+  data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
   space_id = H5Dget_space (data_hid);
   rank = H5Sget_simple_extent_ndims (space_id);
 
@@ -398,7 +398,7 @@
 
 
   H5Dclose (data_hid);
-  data_hid = H5Dopen (group_hid, "dec");
+  data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
   space_id = H5Dget_space (data_hid);
   rank = H5Sget_simple_extent_ndims (space_id);
 
@@ -418,7 +418,7 @@
     }
 
   H5Dclose (data_hid);
-  data_hid = H5Dopen (group_hid, "num");
+  data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
   space_id = H5Dget_space (data_hid);
   rank = H5Sget_simple_extent_ndims (space_id);