diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-06 15:54:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-06 15:54:22 (GMT) |
| commit | 3bed8703631cbcffb215ccd82235fcc293e14218 (patch) | |
| tree | bf56b0bcd4f41986f17138059f6349df78f0c059 /c++ | |
| parent | 3eb8c81b8046d282ced9c2d94e7132058243013e (diff) | |
| download | hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.zip hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.tar.gz hdf5-3bed8703631cbcffb215ccd82235fcc293e14218.tar.bz2 | |
[svn-r14136] Description:
Move H5Gget_num_objs() and several minor macros, etc. to deprecated
symbols section, replacing it with H5Gget_info().
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
AIX/32 5.3 (copper)
Solaris/32 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/examples/h5group.cpp | 2 | ||||
| -rw-r--r-- | c++/src/H5CommonFG.cpp | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp index bcaf2c0..19245ae 100644 --- a/c++/examples/h5group.cpp +++ b/c++/examples/h5group.cpp @@ -142,7 +142,7 @@ int main(void) /* * Create hard link to the Data group. */ - file->link( H5G_LINK_HARD, "Data", "Data_new" ); + file->link( H5L_TYPE_HARD, "Data", "Data_new" ); /* * We can access "Compressed_Data" dataset using created diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp index 7b8c5ac..0ea3923 100644 --- a/c++/src/H5CommonFG.cpp +++ b/c++/src/H5CommonFG.cpp @@ -981,13 +981,14 @@ int CommonFG::iterateElems( const H5std_string& name, int *idx, H5G_iterate_t op //-------------------------------------------------------------------------- hsize_t CommonFG::getNumObjs() const { - hsize_t num_objs; - herr_t ret_value = H5Gget_num_objs(getLocId(), &num_objs); + H5G_info_t ginfo; /* Group information */ + + herr_t ret_value = H5Gget_info(getLocId(), ".", &ginfo, H5P_DEFAULT); if(ret_value < 0) { - throwException("getNumObjs", "H5Gget_num_objs failed"); + throwException("getNumObjs", "H5Gget_info failed"); } - return (num_objs); + return (ginfo.nlinks); } //-------------------------------------------------------------------------- @@ -1118,3 +1119,4 @@ CommonFG::~CommonFG() {} #ifndef H5_NO_NAMESPACE } #endif + |