[svn-r30311] Purpose: Fix bug HDFFR-9920 cont.

trunk:
Description:
    Continued rearranging the classes to model the relationship of HDF5
    objects more accurately.  The changes included:
    - in the baseclass list of Attribute, changed "public IdComponent" to
      "public H5Location", because location sometime can be specified with
      attribute
    - moved H5A wrappers in H5Location to H5Object because H5A functions
      can't be called on attribute id
    - removed the stubs Attribute::iterateAttrs and Attribute::renameAttr
    - removed Attribute::getFileName and Attribute::flush, because
          H5Location has them
    - result of the modified partial class diagram, regarding Attribute

                                IdComponent
                                     |
                                H5Location   AbstractDs
                                /       \   /
                        H5Object     Attribute
Platforms tested:
    Linux/32 2.6 (jam)
    Linux/64 (platypus)
    Darwin (osx1010test)

1 files changed, 3 insertions, 16 deletions

diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index f5ee4a9..6590c23 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -26,10 +26,10 @@ namespace H5 {
 
     An attribute has many characteristics similar to a dataset, thus both
     Attribute and DataSet are derivatives of AbstractDs.  Attribute also
-    inherits from IdComponent because an attribute is an HDF5 component that
-    is identified by an identifier.
+    inherits from H5Location because an attribute can be used to specify
+    a location.
 */
-class H5_DLLCPP Attribute : public AbstractDs, public IdComponent {
+class H5_DLLCPP Attribute : public AbstractDs, public H5Location {
    public:
 
 	// Copy constructor: makes a copy of an existing Attribute object.
@@ -44,9 +44,6 @@ class H5_DLLCPP Attribute : public AbstractDs, public IdComponent {
 	// Closes this attribute.
 	virtual void close();
 
-	// Gets the name of the file, in which this attribute belongs.
-	H5std_string getFileName() const;
-
 	// Gets the name of this attribute.
 	ssize_t getName(char* attr_name, size_t buf_size = 0) const;
 	H5std_string getName(size_t len) const;
@@ -73,10 +70,6 @@ class H5_DLLCPP Attribute : public AbstractDs, public IdComponent {
 	void write(const DataType& mem_type, const void *buf ) const;
 	void write(const DataType& mem_type, const H5std_string& strg ) const;
 
-	// Flushes all buffers associated with the file specified by this
-	// attribute to disk.
-	void flush( H5F_scope_t scope ) const;
-
 	///\brief Returns this class name.
 	virtual H5std_string fromClass () const { return("Attribute"); }
 
@@ -105,12 +98,6 @@ class H5_DLLCPP Attribute : public AbstractDs, public IdComponent {
 	void p_read_variable_len(const DataType& mem_type, H5std_string& strg) const;
 	void p_read_fixed_len(const DataType& mem_type, H5std_string& strg) const;
 
-	// do not inherit H5Object::iterateAttrs
-	int iterateAttrs() { return 0; }
-
-	// do not inherit H5Object::renameAttr
-	void renameAttr() {}
-
 	// Friend function to set Attribute id.  For library use only.
 	friend void f_Attribute_setId(Attribute* attr, hid_t new_id);