diff options
author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2013-09-19 01:54:54 (GMT) |
---|---|---|
committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2013-09-19 01:54:54 (GMT) |
commit | 18b896112c1fd7db68323a9dd4a18cfa19deedc2 (patch) | |
tree | c4bc5d7cf701bc2b8cfdb012b9a664fd69f23589 /c++/src/H5Group.cpp | |
parent | 54a659cb99af799999fbf191d57edb1e1fbbc5df (diff) | |
download | hdf5-18b896112c1fd7db68323a9dd4a18cfa19deedc2.zip hdf5-18b896112c1fd7db68323a9dd4a18cfa19deedc2.tar.gz hdf5-18b896112c1fd7db68323a9dd4a18cfa19deedc2.tar.bz2 |
[svn-r24161] Purpose: More on HDFFV-7520 and HDFFV-533
Description:
- Completed the changes in revisions r22836 and r23438 with improvement
on wrappers such as reference, dereference, get region, and set/getcomment.
- Added more tests.
Platforms tested:
Linux/32 2.6 (jam)
SunOS 5.11 (emu)
Linux/ppc64 (ostrich)
Diffstat (limited to 'c++/src/H5Group.cpp')
-rw-r--r-- | c++/src/H5Group.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp index eff7e50..3150025 100644 --- a/c++/src/H5Group.cpp +++ b/c++/src/H5Group.cpp @@ -99,14 +99,18 @@ Group::Group(const hid_t existing_id) : H5Object() /// is a datatype that has been named by DataType::commit. // Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- -Group::Group(H5Object& obj, const void* ref, H5R_type_t ref_type) : H5Object() + /* Group::Group(H5Object& obj, const void* ref, H5R_type_t ref_type) : H5Object() + */ +Group::Group(const H5Location& loc, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object() { - try { - id = p_dereference(obj.getId(), ref, ref_type); + H5Location::dereference(loc, ref, ref_type, plist); + /* try { + id = p_dereference(loc.getId(), ref, ref_type); } catch (ReferenceException deref_error) { throw ReferenceException("Group constructor - located by an H5Object", deref_error.getDetailMsg()); } + */ } //-------------------------------------------------------------------------- @@ -118,7 +122,7 @@ Group::Group(H5Object& obj, const void* ref, H5R_type_t ref_type) : H5Object() ///\exception H5::ReferenceException // Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- -Group::Group(H5File& h5file, const void* ref, H5R_type_t ref_type) : H5Object() + /* Group::Group(H5File& h5file, const void* ref, H5R_type_t ref_type) : H5Object() { try { id = p_dereference(h5file.getId(), ref, ref_type); @@ -127,6 +131,7 @@ Group::Group(H5File& h5file, const void* ref, H5R_type_t ref_type) : H5Object() deref_error.getDetailMsg()); } } + */ //-------------------------------------------------------------------------- // Function: Group overload constructor - dereference @@ -137,10 +142,10 @@ Group::Group(H5File& h5file, const void* ref, H5R_type_t ref_type) : H5Object() ///\exception H5::ReferenceException // Programmer Binh-Minh Ribler - Oct, 2006 //-------------------------------------------------------------------------- -Group::Group(Attribute& attr, const void* ref, H5R_type_t ref_type) : H5Object() +Group::Group(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object() { try { - id = p_dereference(attr.getId(), ref, ref_type); + id = p_dereference(attr.getId(), ref, ref_type, plist); } catch (ReferenceException deref_error) { throw ReferenceException("Group constructor - located by an Attribute", deref_error.getDetailMsg()); |