summaryrefslogtreecommitdiffstats
path: root/c++/src/H5Object.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2012-03-30 19:34:20 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2012-03-30 19:34:20 (GMT)
commit56d950d3264aae3d935854470a9178a333614bff (patch)
treee74485f6148c1c598b9961556820f7ddec7444f3 /c++/src/H5Object.cpp
parent7f7b8bd9725854fc8b546bcde3252f2c8d5c5d32 (diff)
downloadhdf5-56d950d3264aae3d935854470a9178a333614bff.zip
hdf5-56d950d3264aae3d935854470a9178a333614bff.tar.gz
hdf5-56d950d3264aae3d935854470a9178a333614bff.tar.bz2
[svn-r22209] Purpose: Fixed bugs HDFFV-2761 & HDFFV-7852
Description: - Replaced PredType::NotAtexit() with PredType::AtExit(H5CPP_EXITED) and used PredType::AtExit as a flag to detect when all predefined types have been destroyed. Then, H5close will be called to terminate the library after its being re-initiated when the PredType destructors were activated. This change removed the memory leaks shown by the user's sample program in HDFFV-2761. - Added H5CPP_EXITED for PredType::AtExit to use as a flag - Rearranged constructors in CompType to fix bug HDFFV-7852 - Updated some inaccurate comments - Removed stream functions from FileAccPropList - Replaced H5_VMS with appropriate macro in H5IdComponent.cpp Platforms tested: Linux/32 2.6 (jam) Linux/64 2.6 (amani) SunOS 5.10 (linew)
Diffstat (limited to 'c++/src/H5Object.cpp')
-rw-r--r--c++/src/H5Object.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index d5fa62d..225975b 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -201,7 +201,7 @@ Attribute H5Object::openAttribute( const unsigned int idx ) const
///\exception H5::AttributeIException
///\par Description
/// The signature of user_op is
-/// void (*)(H5::H5Object&, std::string, void*).
+/// void (*)(H5::H5Object&, H5std_string, void*).
/// For information, please refer to the C layer Reference Manual
/// at:
/// http://www.hdfgroup.org/HDF5/doc/RM/RM_H5A.html#Annot-Iterate
@@ -368,9 +368,9 @@ void H5Object::p_reference(void* ref, const char* name, hid_t space_id, H5R_type
///\param name - IN: Name of the object to be referenced
///\param dataspace - IN: Dataspace with selection
///\param ref_type - IN: Type of reference to query, valid values are:
-/// \li \c H5R_OBJECT - Reference is an object reference.
-/// \li \c H5R_DATASET_REGION - Reference is a dataset region
-/// reference. - this is the default
+/// \li \c H5R_OBJECT - Reference is an object reference.
+/// \li \c H5R_DATASET_REGION - Reference is a dataset region
+/// reference. - this is the default
///\exception H5::IdComponentException
// Programmer Binh-Minh Ribler - May, 2004
//--------------------------------------------------------------------------