[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, 7 insertions, 16 deletions

diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index 5c5f995..8fdc47e 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -16,8 +16,8 @@
 
 // Class DataSet inherits from AbstractDs and provides accesses to a dataset.
 
-#ifndef _H5DataSet_H
-#define _H5DataSet_H
+#ifndef __H5DataSet_H
+#define __H5DataSet_H
 
 #ifndef H5_NO_NAMESPACE
 namespace H5 {
@@ -76,21 +76,12 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
 	// Iterates the selected elements in the specified dataspace - not implemented in C++ style yet
         int iterateElems( void* buf, const DataType& type, const DataSpace& space, H5D_operator_t op, void* op_data = NULL );
 
-#ifndef H5_NO_DEPRECATED_SYMBOLS
-	// Retrieves the type of object that an object reference points to.
-	H5G_obj_t getObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
-	// Retrieves a dataspace with the region pointed to selected.
-	DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
-
-	///\brief Returns this class name
+	///\brief Returns this class name.
 	virtual H5std_string fromClass () const { return("DataSet"); }
 
 	// Creates a dataset by way of dereference.
-	DataSet(H5Object& obj, const void* ref, H5R_type_t ref_type = H5R_OBJECT);
-	DataSet(H5File& h5file, const void* ref, H5R_type_t ref_type = H5R_OBJECT);
-	DataSet(Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT);
+	DataSet(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT);
+	DataSet(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT);
 
 	// Default constructor.
 	DataSet();
@@ -110,7 +101,6 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
    private:
 	hid_t id;       // HDF5 dataset id
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
         // This function contains the common code that is used by
         // getTypeClass and various API functions getXxxType
         // defined in AbstractDs for generic datatype and specific
@@ -122,6 +112,7 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
 	void p_read_variable_len(const hid_t mem_type_id, const hid_t mem_space_id, const hid_t file_space_id, const hid_t xfer_plist_id, H5std_string& strg) const;
 
    protected:
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
         // Sets the dataset id.
         virtual void p_setId(const hid_t new_id);
 #endif // DOXYGEN_SHOULD_SKIP_THIS
@@ -129,4 +120,4 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs {
 #ifndef H5_NO_NAMESPACE
 }
 #endif
-#endif
+#endif // __H5DataSet_H