Merge pull request #209 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp:develop to develop

- Replacing openXxxType with individual type constructors
- Put back CommonFG
- Removed overloaded constructors that take an Attribute where there is one that takes an H5Location

* commit 'e05da1b533d5eb9527a5b67ba2683379f8e1e7ac':
  Description:     Removed commented out code and fixed miscellaneous typos. Platforms tested:     Linux/32 2.6 (jam) (very minor)
  Purpose: Improvement for HDFFV-10004 Description:     When adding wrappers for H5Lexists, a new class, LinkAccPropList, was     added to the C++ API, triggered complicated circular dependencies.  Thus,     some improvement was made to resolve the problems.     - Replaced existing functions openXxxType with individual type constructors       + Added individual XxxType constructors to replace the existing functions         openXxxType because it's rather awkward to use these functions.       + Moved openXxxType from H5Location back to CommonFG       + Put back CommonFG as a baseclass of Group for openXxxType functions.       + This replacement should improve usability and prevent the problem of         circular dependencies.     - Removed overloaded constructor that takes an Attribute when there is         already one that takes H5Location because Attribute inherits from         H5Location now. Platforms tested:     Linux/32 2.6 (jam)     Darwin (osx1010test)     Linux/64 (platypus)

1 files changed, 2 insertions, 2 deletions

diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 5f4b0f3..0a9e975 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -28,7 +28,7 @@ namespace H5 {
 class ArrayType;
 class VarLenType;
 
-class H5_DLLCPP Group : public H5Object {
+class H5_DLLCPP Group : public H5Object, public CommonFG {
    public:
 	// Group constructor to create a group or file (aka root group).
 	Group(const char* name, size_t size_hint = 0);
@@ -52,7 +52,7 @@ class H5_DLLCPP Group : public H5Object {
 
 	// Creates a group by way of dereference.
 	Group(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
-        Group(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
+//        Group(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
 
 	// default constructor
 	Group();