diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-07-16 23:43:29 (GMT) |
| commit | 1e612c3a46880773d53ad315f3aef2104abb9347 (patch) | |
| tree | 1259838b4fe2f3bb8ca78c8f0b4dea00557c89d1 /src/H5Dint.c | |
| parent | 5e94d0336fa7a0ebc0a25d002b413221284691b6 (diff) | |
| parent | 75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1 (diff) | |
| download | hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.zip hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.gz hdf5-1e612c3a46880773d53ad315f3aef2104abb9347.tar.bz2 | |
[svn-r22584] merge from trunk and resolve type ID registration
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 537b7ed..402ff8d 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -110,6 +110,16 @@ H5FL_BLK_EXTERN(type_conv); /* Define a static "default" dataset structure to use to initialize new datasets */ static H5D_shared_t H5D_def_dset; +/* Dataset ID class */ +static const H5I_class_t H5I_DATASET_CLS[1] = {{ + H5I_DATASET, /* ID class value */ + 0, /* Class flags */ + 64, /* Minimum hash size for class */ + 0, /* # of reserved IDs for class */ + NULL, /* Callback routine for closing objects of this class */ + (H5I_free2_t)H5D_close_dataset /* Callback routine for closing auxilary objects of this class */ +}}; + /*------------------------------------------------------------------------- @@ -163,8 +173,7 @@ H5D__init_interface(void) FUNC_ENTER_STATIC /* Initialize the atom group for the dataset IDs */ - if(H5I_register_type(H5I_DATASET, (size_t)H5I_DATASETID_HASHSIZE, H5D_RESERVED_ATOMS, - NULL, (H5I_free2_t)H5D_close_dataset)<H5I_FILE) + if(H5I_register_type(H5I_DATASET_CLS) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to initialize interface") /* Reset the "default dataset" information */ |