[svn-r24216] Purpose: Merged changes from trunk

Description from trunk, r22836
    In this bug, H5File doesn't have the ability to create attribute.  The
    following changes will provide that functionality and several others that
    were also missing:
    - Added an abstract class H5Location in between IdComponent and H5Object.
    - New class structure of IdComponent, H5Location, H5Object, H5File
                                IdComponent
                                     |
                                H5Location
                                /        \
                        H5Object        H5File
    - Wrappers in H5Object were moved to H5Location because the related C
      functions take either file, group, dataset, or named datatype ID.
    - Added wrapper for H5Rget_obj_type2
    - Added tests for file attributes and H5Rget_obj_type2 wrapper

Description from trunk, r22845
    Fixed miscellaneous inconsistencies and typos, which also took
    care of the failure in Packet Table test on daily test today.

Description from trunk, r24143
    Fixed comments, documentation, and mis-matched DOXYGEN_SHOULD_SKIP_THIS pairs.

Description from trunk, r24188
    - The failure in daily test was caused by missing initialization of member
    "id" in a few constructors.  This is now fixed.
    - Added two overloaded H5Location::setComment
    - Improved some error reporting in H5Location
    - Improved error reporting in tests

Description from trunk, r24189
    Changed header guards from single underscore to double underscore.

Platforms tested:
    SunOS 5.11 (emu)
    Linux/32 2.6 (jam)
    Linux/64 2.6 (koala)/PGI compilers

1 files changed, 4 insertions, 16 deletions

diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h
index 4f32d21..1748d1d 100644
--- a/c++/src/H5CommonFG.h
+++ b/c++/src/H5CommonFG.h
@@ -18,8 +18,8 @@
 // common services that are provided by H5File and Group.  The file or
 // group in the context of this class is referred to as 'location'.
 
-#ifndef _CommonFG_H
-#define _CommonFG_H
+#ifndef __CommonFG_H
+#define __CommonFG_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -49,18 +49,6 @@ class H5_DLLCPP CommonFG {
 	DataSet openDataSet(const char* name) const;
 	DataSet openDataSet(const H5std_string& name) const;
 
-	// Retrieves comment for the HDF5 object specified by its name.
-	H5std_string getComment(const char* name, size_t bufsize=256) const;
-	H5std_string getComment(const H5std_string& name, size_t bufsize=256) const;
-
-	// Removes the comment for the HDF5 object specified by its name.
-	void removeComment(const char* name) const;
-	void removeComment(const H5std_string& name) const;
-
-	// Sets the comment for an HDF5 object specified by its name.
-	void setComment(const char* name, const char* comment) const;
-	void setComment(const H5std_string& name, const H5std_string& comment) const;
-
 	// Returns the value of a symbolic link.
 	H5std_string getLinkval(const char* link_name, size_t size=0) const;
 	H5std_string getLinkval(const H5std_string& link_name, size_t size=0) const;
@@ -152,7 +140,6 @@ class H5_DLLCPP CommonFG {
 	/// object id, i.e. file or group id.
 	virtual hid_t getLocId() const = 0;
 
-#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 	/// For subclasses, H5File and Group, to throw appropriate exception.
 	virtual void throwException(const H5std_string& func_name, const H5std_string& msg) const = 0;
@@ -162,11 +149,12 @@ class H5_DLLCPP CommonFG {
 
 	// Noop destructor.
 	virtual ~CommonFG();
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 }; // end of CommonFG declaration
 
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __CommonFG_H