[svn-r9127] Purpose: Adding wrapper for new C API and other updates

Description:
    Added wrappers for H5Fget_name:
        H5File::getFileName
        H5Object::getFileName
    Moved some functions from Group into the base class CommonFG for
        H5File too.

Platforms tested:
    SunOS 5.7 (arabica)
    Linux 2.4 (eirene)

1 files changed, 15 insertions, 9 deletions

diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index d527250..fdc6c76 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -27,6 +27,7 @@
 namespace H5 {
 #endif
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 class H5_DLLCPP H5Object;  // forward declaration for UserData4Aiterate
 
 // Define the operator function pointer for H5Aiterate().
@@ -41,17 +42,12 @@ class UserData4Aiterate { // user data for attribute iteration
 	void* opData;
 	H5Object* object;
 };
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 // The above part is being moved into Iterator, but not completed
 
 class H5_DLLCPP H5Object : public IdComponent {
    public:
-	// Copy constructor: makes copy of an H5Object object.
-	H5Object( const H5Object& original );
-
-	// Flushes all buffers associated with this object to disk
-	void flush( H5F_scope_t scope ) const;
-
 	// Creates an attribute for a group, dataset, or named datatype.
 	// PropList is currently not used, so always be default.
 	Attribute createAttribute( const char* name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT ) const;
@@ -64,26 +60,36 @@ class H5_DLLCPP H5Object : public IdComponent {
 	// Opens an attribute given its index.
 	Attribute openAttribute( const unsigned int idx ) const;
 
-	// Iterate user's function over the attributes of this object
-	int iterateAttrs( attr_operator_t user_op, unsigned* idx = NULL, void* op_data = NULL );
+	// Flushes all buffers associated with this object to disk
+	void flush( H5F_scope_t scope ) const;
+
+	// Gets the name of the file, in which this HDF5 object belongs.
+	string getFileName() const;
 
 	// Determines the number of attributes attached to this object.
 	int getNumAttrs() const;
 
+	// Iterate user's function over the attributes of this object
+	int iterateAttrs( attr_operator_t user_op, unsigned* idx = NULL, void* op_data = NULL );
+
 	// Removes the named attribute from this object.
 	void removeAttr( const char* name ) const;
 	void removeAttr( const string& name ) const;
 
+	// Copy constructor: makes copy of an H5Object object.
+	H5Object(const H5Object& original);
+
 	// Noop destructor.
 	virtual ~H5Object();
 
    protected:
-
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 	// Default constructor
 	H5Object();
 
 	// Creates a copy of an existing object giving the object id
 	H5Object( const hid_t object_id );
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 }; /* end class H5Object */