[svn-r12404] Purpose: Fix typos/formats

Description:
    Fixed typos and re-arranged some functions to be in sync with 1.6.

Platforms tested:
    Linux 2.4 (heping)
    SunOS 5.9 (shanti)
    AIX 5.1 (copper)

1 files changed, 8 insertions, 10 deletions

diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index 79f2c61..7132105 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -251,12 +251,10 @@ void H5File::openFile(const H5std_string& name, unsigned int flags, const FileAc
 //              be investigated.  BMR - 2/20/2005
 // Modification
 //		Replaced resetIdComponent with decRefCount to use C library
-//		ID reference counting mechanism - June 1, 2004
+//		ID reference counting mechanism - BMR, Jun 1, 2004
 //--------------------------------------------------------------------------
 void H5File::reOpen()
 {
-   // If this object has a valid id, appropriately decrement reference
-   // counter and close the id.
     try {
         close();
     }
@@ -488,7 +486,7 @@ void H5File::getVFDHandle(void **file_handle) const
 // Function:	H5File::getFileName
 ///\brief	Gets the name of this file.
 ///\return	File name
-///\exception	H5::IdComponentException
+///\exception	H5::FileIException
 // Programmer	Binh-Minh Ribler - Jul, 2004
 //--------------------------------------------------------------------------
 H5std_string H5File::getFileName() const
@@ -508,7 +506,7 @@ H5std_string H5File::getFileName() const
 ///\param	dataspace - IN: Dataspace with selection
 ///\param	ref_type - IN: Type of reference; default to \c H5R_DATASET_REGION
 ///\return	A reference
-///\exception	H5::IdComponentException
+///\exception	H5::FileIException
 ///\par Description
 ///		Note that name must be an absolute path to the object in the file.
 // Programmer	Binh-Minh Ribler - May, 2004
@@ -530,7 +528,7 @@ void* H5File::Reference(const char* name, DataSpace& dataspace, H5R_type_t ref_t
 ///		a reference to an HDF5 object, not to a dataset region.
 ///\param	name - IN: Name of the object to be referenced
 ///\return	A reference
-///\exception	H5::IdComponentException
+///\exception	H5::FileIException
 ///\par Description
 //		This function passes H5R_OBJECT and -1 to the protected
 //		function for it to pass to the C API H5Rcreate
@@ -573,7 +571,7 @@ void* H5File::Reference(const H5std_string& name) const
 ///		\li \c H5G_GROUP   - Object is a group.
 ///		\li \c H5G_DATASET - Object is a dataset.
 ///		\li \c H5G_TYPE    - Object is a named datatype
-///\exception	H5::IdComponentException
+///\exception	H5::FileIException
 // Programmer	Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
 H5G_obj_t H5File::getObjType(void *ref, H5R_type_t ref_type) const
@@ -592,7 +590,7 @@ H5G_obj_t H5File::getObjType(void *ref, H5R_type_t ref_type) const
 ///\param	ref      - IN: Reference to get region of
 ///\param	ref_type - IN: Type of reference to get region of - default
 ///\return	DataSpace instance
-///\exception	H5::IdComponentException
+///\exception	H5::FileIException
 // Programmer	Binh-Minh Ribler - May, 2004
 //--------------------------------------------------------------------------
 DataSpace H5File::getRegion(void *ref, H5R_type_t ref_type) const
@@ -675,7 +673,7 @@ void H5File::close()
 //		implementation of H5File.
 // Programmer	Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
-void H5File::throwException(const H5std_string func_name, const H5std_string msg) const
+void H5File::throwException(const H5std_string& func_name, const H5std_string& msg) const
 {
    H5std_string full_name = func_name;
    full_name.insert(0, "H5File::");
@@ -688,7 +686,7 @@ void H5File::throwException(const H5std_string func_name, const H5std_string msg
 // Programmer	Binh-Minh Ribler - 2000
 // Modification
 //		Replaced resetIdComponent with decRefCount to use C library
-//		ID reference counting mechanism - June 1, 2004
+//		ID reference counting mechanism - BMR, Jun 1, 2004
 //--------------------------------------------------------------------------
 H5File::~H5File()
 {