diff options
author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2008-07-28 02:20:23 (GMT) |
---|---|---|
committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2008-07-28 02:20:23 (GMT) |
commit | 9d250c48fbe522b2727b87ce4a6571f09a498cc7 (patch) | |
tree | 249674d49efd8b1077913c4e0e009cf4c199413b /c++ | |
parent | 5d5116554d058b58177388ddde7589f7d7b34c51 (diff) | |
download | hdf5-9d250c48fbe522b2727b87ce4a6571f09a498cc7.zip hdf5-9d250c48fbe522b2727b87ce4a6571f09a498cc7.tar.gz hdf5-9d250c48fbe522b2727b87ce4a6571f09a498cc7.tar.bz2 |
[svn-r15414] Purpose: Clean up
Description:
Removed commented out code.
Platforms tested:
C++ part on:
Linux 2.6 (kagiso)
SunOS 5.10 (linew)
FreeBSD (duty)
Diffstat (limited to 'c++')
-rw-r--r-- | c++/src/H5Group.cpp | 27 | ||||
-rw-r--r-- | c++/src/H5Object.cpp | 31 |
2 files changed, 1 insertions, 57 deletions
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp index 57da96d..16b0fee 100644 --- a/c++/src/H5Group.cpp +++ b/c++/src/H5Group.cpp @@ -115,33 +115,6 @@ Group::Group(H5File& h5file, void* ref, H5R_type_t ref_type) : H5Object() dereference(h5file, ref, ref_type); } -#if 0 // remove after verifying with tests -//-------------------------------------------------------------------------- -// Function: Group::getObjType -///\brief Retrieves the type of object that an object reference points to. -///\param ref - IN: Reference to query -/// ref_type - IN: Type of reference to query, valid values are: -/// \li \c H5R_OBJECT \tReference is an object reference. -/// \li \c H5R_DATASET_REGION \tReference is a dataset region reference. -///\return An object type, which can be one of the following: -/// H5G_LINK Object is a symbolic link. -/// H5G_GROUP Object is a group. -/// H5G_DATASET Object is a dataset. -/// H5G_TYPE Object is a named datatype -///\exception H5::GroupIException -// Programmer Binh-Minh Ribler - May, 2004 -//-------------------------------------------------------------------------- -H5G_obj_t Group::getObjType(void *ref, H5R_type_t ref_type) const -{ - try { - return(p_get_obj_type(ref, ref_type)); - } - catch (IdComponentException E) { - throw GroupIException("Group::getObjType", E.getDetailMsg()); - } -} -#endif - //-------------------------------------------------------------------------- // Function: H5File::getObjType ///\brief This function was misnamed and will be deprecated in favor of diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index f58c5c4..73d473c 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -419,7 +419,7 @@ void H5Object::reference(void* ref, const H5std_string& name) const //-------------------------------------------------------------------------- // Function: H5Object::dereference -// Purpose Dereference a ref into a DataSet object. +// Purpose Dereference a ref into an hdf5 object. // Parameters // ref - IN: Reference pointer // Exception H5::IdComponentException @@ -428,35 +428,6 @@ void H5Object::reference(void* ref, const H5std_string& name) const // May 2008 - BMR // Moved from IdComponent into H5File and H5Object //-------------------------------------------------------------------------- -#if 0 -void H5Object::dereference(H5File& h5file, void* ref) -{ - hid_t temp_id; - try { - temp_id = p_dereference(h5file.getId(), ref); - } - catch (ReferenceException ref_err) { - throw (inMemFunc("dereference"), ref_err.getDetailMsg()); - } - - // No failure, set id to the object - p_setId(temp_id); -} -void H5Object::dereference(H5Object& obj, void* ref) -{ - hid_t temp_id; - try { - temp_id = p_dereference(obj.getId(), ref); - } - catch (ReferenceException ref_err) { - throw (inMemFunc("dereference"), ref_err.getDetailMsg()); - } - - // No failure, set id to the object - p_setId(temp_id); -} - -#endif void H5Object::dereference(H5Object& obj, void* ref, H5R_type_t ref_type) { hid_t temp_id; |