[Octave-cvsupdate] SF.net SVN: octave:[10117] trunk/octave-forge/main/fixed/src

[<jo...@us...>]

Revision: 10117
          http://octave.svn.sourceforge.net/octave/?rev=10117&view=rev
Author:   jordigh
Date:     2012-03-30 15:59:45 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
Description: Make the package compile against HDF5 1.8
Author: Rafael Laboissiere <ra...@la...>

Modified Paths:
--------------
    trunk/octave-forge/main/fixed/src/ov-fixed-complex.cc
    trunk/octave-forge/main/fixed/src/ov-fixed-cx-mat.cc
    trunk/octave-forge/main/fixed/src/ov-fixed-mat.cc
    trunk/octave-forge/main/fixed/src/ov-fixed.cc

Modified: trunk/octave-forge/main/fixed/src/ov-fixed-complex.cc
===================================================================
--- trunk/octave-forge/main/fixed/src/ov-fixed-complex.cc	2012-03-30 15:14:48 UTC (rev 10116)
+++ trunk/octave-forge/main/fixed/src/ov-fixed-complex.cc	2012-03-30 15:59:45 UTC (rev 10117)
@@ -349,7 +349,7 @@
 				 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];
@@ -371,7 +371,8 @@
       return false;
     }
 
-  data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT,
+                        H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -395,7 +396,8 @@
       return false;
     }    
 
-  data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT,
+                        H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -427,7 +429,8 @@
       return false;
     }
 
-  data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT,
+                        H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -458,12 +461,12 @@
   hid_t group_hid, data_hid, type_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;
 
   hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UCHAR, 1);
 
-  data_hid = H5Dopen (group_hid, "int");
+  data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
   type_hid = H5Dget_type (data_hid);
 
   if (! hdf5_types_compatible (type_hid, complex_type))
@@ -499,7 +502,7 @@
 
   H5Tclose(type_hid);
   H5Dclose (data_hid);
-  data_hid = H5Dopen (group_hid, "dec");
+  data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
   type_hid = H5Dget_type (data_hid);
 
   if (! hdf5_types_compatible (type_hid, complex_type))
@@ -539,7 +542,7 @@
 
   complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT, 
 					       sizeof(unsigned int));
-  data_hid = H5Dopen (group_hid, "num");
+  data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
   type_hid = H5Dget_type (data_hid);
 
   if (! hdf5_types_compatible (type_hid, complex_type))

Modified: trunk/octave-forge/main/fixed/src/ov-fixed-cx-mat.cc
===================================================================
--- trunk/octave-forge/main/fixed/src/ov-fixed-cx-mat.cc	2012-03-30 15:14:48 UTC (rev 10116)
+++ trunk/octave-forge/main/fixed/src/ov-fixed-cx-mat.cc	2012-03-30 15:59:45 UTC (rev 10117)
@@ -616,7 +616,7 @@
 					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;
 
   dim_vector d = dims ();
@@ -644,7 +644,8 @@
       return false;
     }
 
-  data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "int", type_hid, space_hid, H5P_DEFAULT,
+                        H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -671,7 +672,8 @@
       return false;
     }    
 
-  data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "dec", type_hid, space_hid, H5P_DEFAULT,
+                        H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -707,7 +709,8 @@
       return false;
     }
 
-  data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT);
+  data_hid = H5Dcreate (group_hid, "num", type_hid, space_hid, H5P_DEFAULT,
+                        H5P_DEFAULT, H5P_DEFAULT);
   if (data_hid < 0) 
     {
       H5Sclose (space_hid);
@@ -740,13 +743,13 @@
   hid_t group_hid, data_hid, space_id, type_hid;
   hsize_t rank, rank_old;
 
-  group_hid = H5Gopen (loc_id, name);
+  group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
   if (group_hid < 0 ) return false;
 
   hid_t complex_type = hdf5_make_fixed_complex_type (H5T_NATIVE_UINT, 
 						     sizeof(unsigned int));
 
-  data_hid = H5Dopen (group_hid, "int");
+  data_hid = H5Dopen (group_hid, "int", H5P_DEFAULT);
   type_hid = H5Dget_type (data_hid);
 
   if (! hdf5_types_compatible (type_hid, complex_type))
@@ -810,7 +813,7 @@
   H5Tclose(type_hid);
   H5Dclose (data_hid);
 
-  data_hid = H5Dopen (group_hid, "dec");
+  data_hid = H5Dopen (group_hid, "dec", H5P_DEFAULT);
   type_hid = H5Dget_type (data_hid);
 
   if (! hdf5_types_compatible (type_hid, complex_type))
@@ -875,7 +878,7 @@
   H5Tclose(type_hid);
   H5Dclose (data_hid);
 
-  data_hid = H5Dopen (group_hid, "num");
+  data_hid = H5Dopen (group_hid, "num", H5P_DEFAULT);
   type_hid = H5Dget_type (data_hid);
 
   if (! hdf5_types_compatible (type_hid, complex_type))

Modified: trunk/octave-forge/main/fixed/src/ov-fixed-mat.cc
===================================================================
--- trunk/octave-forge/main/fixed/src/ov-fixed-mat.cc	2012-03-30 15:14:48 UTC (rev 10116)
+++ trunk/octave-forge/main/fixed/src/ov-fixed-mat.cc	2012-03-30 15:59:45 UTC (rev 10117)
@@ -574,7 +574,7 @@
 octave_fixed_matrix::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;
 
   dim_vector d = dims ();
@@ -595,7 +595,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);
@@ -618,7 +618,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);
@@ -640,7 +640,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);
@@ -668,10 +668,10 @@
   hid_t group_hid, data_hid, space_id;
   hsize_t rank, rank_old;
 
-  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);
   rank_old = rank;
@@ -719,7 +719,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);
 
@@ -766,7 +766,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);
 

Modified: trunk/octave-forge/main/fixed/src/ov-fixed.cc
===================================================================
--- trunk/octave-forge/main/fixed/src/ov-fixed.cc	2012-03-30 15:14:48 UTC (rev 10116)
+++ trunk/octave-forge/main/fixed/src/ov-fixed.cc	2012-03-30 15:59:45 UTC (rev 10117)
@@ -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);
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.