Code improvement

Description:
    - Moved class H5File to inherit from class Group because an HDF5 file is
      a root group
    - Cleanup header file inclusion and class forward declaration
    - Revised comments
Platforms tested:
    Linux/32 2.6 (jam)
    Linux/64 (platypus)
    Darwin (osx1010test)

1 files changed, 6 insertions, 10 deletions

diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h
index 3fd29a4..fa9e8a9 100644
--- a/c++/src/H5Object.h
+++ b/c++/src/H5Object.h
@@ -17,10 +17,8 @@
 #ifndef __H5Object_H
 #define __H5Object_H
 
-#include "H5Location.h"
-#include "H5Classes.h"          // constains forward class declarations
-
 namespace H5 {
+
 /*! \class H5Object
     \brief Class H5Object is a bridge between H5Location and DataSet, DataType,
      and Group.
@@ -33,21 +31,19 @@ namespace H5 {
                 group, dataset, and named datatype.  Note that the reason for
                 adding H5Location instead of simply moving H5File to be under
                 H5Object is H5File is not an HDF5 object, and renaming H5Object
-                to H5Location will risk breaking user applications.
-                -BMR
-        Apr 2, 2014: Added wrapper getObjName for H5Iget_name
-
-    Inheritance: H5Location -> IdComponent
+                to H5Location will risk breaking user applications.  -BMR
+        Apr 2, 2014: Added wrapper getObjName for H5Iget_name -BMR
 */
+//  Inheritance: H5Location -> IdComponent
 class H5_DLLCPP H5Object : public H5Location {
    public:
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
         // Gets the name of this HDF5 object, i.e., Group, DataSet, or
-        // DataType.  These should have const but are retiring anyway.
+        // DataType.
         ssize_t getObjName(char *obj_name, size_t buf_size = 0) const;
         ssize_t getObjName(H5std_string& obj_name, size_t len = 0) const;
         H5std_string getObjName() const;
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
         // Noop destructor.
         virtual ~H5Object();