[svn-r15308] Purpose: Fixed bugs

Description:
    The class hierarchy was revised to address the problem reported in
    bugzilla #1068.  Classes AbstractDS and Attribute are moved out of
    H5Object.  Class Attribute now multiply inherits from IdComponent and
    AbstractDs and class DataSet from H5Object and AbstractDs.

    In addition, data member IdComponent::id was moved into subclasses:
    Attribute, DataSet, DataSpace, DataType, H5File, Group, and PropList.

Platforms tested:
    SunOS 5.10 (linew)
    Linux 2.6 (kagiso)
    FreeBSD (duty)

1 files changed, 8 insertions, 9 deletions

diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 5df85bb..091ea72 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -34,14 +34,6 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
 	// Retrieves a dataspace with the region pointed to selected.
 	DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
 
-	// Creates a reference to a named Hdf5 object or to a dataset region
-	// in this object.
-	void* Reference(const char* name, DataSpace& dataspace, H5R_type_t ref_type = H5R_DATASET_REGION) const; // will be obsolete
-
-	// Creates a reference to a named Hdf5 object in this object.
-	void* Reference(const char* name) const; // will be obsolete
-	void* Reference(const H5std_string& name) const; // will be obsolete
-
 	// Returns this class name
 	virtual H5std_string fromClass () const { return("Group"); }
 
@@ -52,7 +44,8 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
 	virtual hid_t getLocId() const;
 
 	// Creates a group by way of dereference.
-	Group(IdComponent& obj, void* ref);
+	Group(H5Object& obj, void* ref);
+	Group(H5File& obj, void* ref);
 
 	// default constructor
 	Group();
@@ -60,12 +53,18 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
 	// Copy constructor: makes a copy of the original object
 	Group(const Group& original);
 
+	// Gets the group id.
+	virtual hid_t getId() const;
+	virtual void setId(const hid_t new_id);
+
 	// Destructor
 	virtual ~Group();
 
 	// Creates a copy of an existing group using its id.
 	Group( const hid_t group_id );
 
+   private:
+	hid_t id;	// HDF5 group id
 };
 #ifndef H5_NO_NAMESPACE
 }