Merge pull request #355 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp3:develop to develop

* commit '778a16daafe5d8edc4df9ddb35eb3e692d3adfbe':
  Description:     Fixed typos and missing items in function headers, that were revealed     by Doxygen, and revised various comments. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus)     Darwin (osx1010test)

18 files changed, 117 insertions, 82 deletions

diff --git a/c++/src/H5ArrayType.cpp b/c++/src/H5ArrayType.cpp
index 3cdcc0a..c8bd0fc 100644
--- a/c++/src/H5ArrayType.cpp
+++ b/c++/src/H5ArrayType.cpp
@@ -77,11 +77,12 @@ ArrayType::ArrayType(const DataType& base_type, int ndims, const hsize_t* dims)
 // Function:    ArrayType overloaded constructor
 ///\brief       Creates an ArrayType instance by opening an HDF5 array datatype
 ///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Array type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openArrayType(const char*) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -94,12 +95,13 @@ ArrayType::ArrayType(const H5Location& loc, const char *dtype_name) : DataType()
 //--------------------------------------------------------------------------
 // Function:    ArrayType overloaded constructor
 ///\brief       Creates an ArrayType instance by opening an HDF5 array datatype
-///              given its name, provided as an \c H5std_string.
+///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Array type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openArrayType(const H5std_string&)
 //              to improve usability.
 //              -BMR, Dec 2016
diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp
index 037527f..7db2cfe 100644
--- a/c++/src/H5CompType.cpp
+++ b/c++/src/H5CompType.cpp
@@ -91,11 +91,12 @@ CompType::CompType(const DataSet& dataset) : DataType()
 // Function:    CompType overloaded constructor
 ///\brief       Creates an CompType instance by opening an HDF5 compound
 ///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Compound type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openCompType(const char*) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -109,11 +110,12 @@ CompType::CompType(const H5Location& loc, const char *dtype_name) : DataType()
 // Function:    CompType overloaded constructor
 ///\brief       Creates an CompType instance by opening an HDF5 compound
 ///             datatype given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Compound type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openCompType(const H5Location&)
 //              to improve usability.
 //              -BMR, Dec 2016
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index c88d6eb..2795485 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -109,13 +109,13 @@ DataType::DataType(const H5Location& loc, const void* ref, H5R_type_t ref_type,
 
 //--------------------------------------------------------------------------
 // Function:    DataType overload constructor - dereference
-///\brief       Given a reference, ref, to an hdf5 group, creates a
-///             DataType object
-///\param       attr - IN: Specifying location where the referenced object is in
-///\param       ref - IN: Reference pointer
-///\param       ref_type - IN: Reference type - default to H5R_OBJECT
-///\param       plist - IN: Property list - default to PropList::DEFAULT
-///\exception   H5::ReferenceException
+// brief       Given a reference, ref, to an hdf5 group, creates a
+//             DataType object
+// param       attr - IN: Specifying location where the referenced object is in
+// param       ref - IN: Reference pointer
+// param       ref_type - IN: Reference type - default to H5R_OBJECT
+// param       plist - IN: Property list - default to PropList::DEFAULT
+// exception   H5::ReferenceException
 // Programmer   Binh-Minh Ribler - Oct, 2006
 // Modification
 //        Jul, 2008
@@ -162,11 +162,12 @@ DataType::DataType(const PredType& pred_type) : H5Object()
 // Function:    DataType overloaded constructor
 ///\brief       Creates a DataType instance by opening an HDF5 datatype given
 ///             its name as a char*.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Datatype name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openDataType(const char*) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -180,11 +181,12 @@ DataType::DataType(const H5Location& loc, const char *dtype_name) : H5Object()
 // Function:    DataType overloaded constructor
 ///\brief       Creates a DataType instance by opening an HDF5 datatype given
 ///             its name as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Datatype name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openDataType(const H5std_string&) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -300,27 +302,6 @@ bool DataType::operator==(const DataType& compared_type) const
 }
 
 //--------------------------------------------------------------------------
-// Function:    DataType::p_opentype (private)
-///\brief       Opens an HDF5 datatype given its name
-///\param       dtype_name - IN: Datatype name
-///\exception   H5::DataTypeIException
-// Programmer   Binh-Minh Ribler - Dec 2016
-// Description
-//              This function was introduced in 1.10.1 to be used by the new
-//              XxxType constructors that were introduced to replace the
-//              existing functions CommonFG::openXxxType(), which is awkward
-//              to use.  -BMR, Dec 2016
-//--------------------------------------------------------------------------
-hid_t DataType::p_opentype(const H5Location& loc, const char *dtype_name) const
-{
-    // Call C function to open the named datatype at this location
-    hid_t ret_value = H5Topen2(loc.getId(), dtype_name, H5P_DEFAULT);
-    if (ret_value < 0)
-        throw DataTypeIException("DataType constructor", "H5Topen2 failed");
-    return(ret_value);
-}
-
-//--------------------------------------------------------------------------
 // Function:    DataType::p_commit (private)
 //\brief        Commits a transient datatype to a file, creating a new
 //              named datatype
@@ -787,6 +768,26 @@ hid_t DataType::getId() const
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
+// Function:    DataType::p_opentype (private)
+///\brief       Opens an HDF5 datatype given its name
+///\param       loc        - IN: Location of the type
+///\param       dtype_name - IN: Datatype name
+///\exception   H5::DataTypeIException
+// Programmer   Binh-Minh Ribler - Dec 2016
+// Description
+//              This function was introduced in 1.10.1 to be used by the new
+//              XxxType constructors that open a datatype. -BMR, Dec 2016
+//--------------------------------------------------------------------------
+hid_t DataType::p_opentype(const H5Location& loc, const char *dtype_name) const
+{
+    // Call C function to open the named datatype at this location
+    hid_t ret_value = H5Topen2(loc.getId(), dtype_name, H5P_DEFAULT);
+    if (ret_value < 0)
+        throw DataTypeIException("DataType constructor", "H5Topen2 failed");
+    return(ret_value);
+}
+
+//--------------------------------------------------------------------------
 // Function:    DataType::p_setId
 ///\brief       Sets the identifier of this object to a new value.
 ///
diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp
index e1be3c4..966ca16 100644
--- a/c++/src/H5DcreatProp.cpp
+++ b/c++/src/H5DcreatProp.cpp
@@ -744,13 +744,13 @@ void DSetCreatPropList::getExternal(unsigned idx, size_t name_size, char* name,
 // Function:    DSetCreatPropList::setVirtual
 ///\brief       Maps elements of a virtual dataset to elements of the source
 ///             dataset.
-///\param       vspace    - IN: Dataspace the virtual dataset, possibly an
+///\param       vspace     - IN: Dataspace the virtual dataset, possibly an
 ///                             unlimited selection
-///\param       src_fname - IN: Name of the HDF5 file where the source dataset
+///\param       src_fname  - IN: Name of the HDF5 file where the source dataset
 ///                             is located (\a char*)
-///\param       src_fname - IN: Path to the dataset in the file specified by
+///\param       src_dsname - IN: Path to the dataset in the file specified by
 ///                             \a src_file_name (\a char*)
-///\param       sspace    - IN: Dataspace with a selection applied, possibly
+///\param       sspace     - IN: Dataspace with a selection applied, possibly
 ///                             an unlimited selection
 ///\exception   H5::PropListIException
 ///\par Description
@@ -771,13 +771,13 @@ void DSetCreatPropList::setVirtual(const DataSpace& vspace, const char *src_fnam
 // Function:    DSetCreatPropList::setVirtual
 ///\brief       Maps elements of a virtual dataset to elements of the source
 ///             dataset.
-///\param       vspace    - IN: Dataspace the virtual dataset, possibly an
+///\param       vspace     - IN: Dataspace the virtual dataset, possibly an
 ///                             unlimited selection
-///\param       src_fname - IN: Name of the HDF5 file where the source dataset
+///\param       src_fname  - IN: Name of the HDF5 file where the source dataset
 ///                             is located (\a H5std_string)
-///\param       src_fname - IN: Path to the dataset in the file specified by
+///\param       src_dsname - IN: Path to the dataset in the file specified by
 ///                             \a src_file_name (\a H5std_string)
-///\param       sspace    - IN: Dataspace with a selection applied, possibly
+///\param       sspace     - IN: Dataspace with a selection applied, possibly
 ///                             an unlimited selection
 ///\exception   H5::PropListIException
 ///\par Description
diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp
index 49f60e6..9072aab 100644
--- a/c++/src/H5EnumType.cpp
+++ b/c++/src/H5EnumType.cpp
@@ -114,10 +114,11 @@ EnumType::EnumType(const IntType& data_type) : DataType()
 ///\brief       Creates an EnumType instance by opening an HDF5 enum datatype
 ///             given its name, provided as a C character string.
 ///\param       dtype_name - IN: Enum datatype name
+///\param       loc        - IN: Location of the type
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openEnumType(const char*) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -131,11 +132,12 @@ EnumType::EnumType(const H5Location& loc, const char *dtype_name) : DataType()
 // Function:    EnumType overloaded constructor
 ///\brief       Creates an EnumType instance by opening an HDF5 enum datatype
 ///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Enum datatype name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openEnumType(const H5std_string&)
 //              to improve usability.
 //              -BMR, Dec 2016
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index 893db64..b3e6b7b 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -298,7 +298,8 @@ unsigned FileCreatPropList::getIstorek() const
 // Function:    FileCreatPropList::setFileSpaceStrategy
 ///\brief       Sets the strategy and the threshold value that the library
 ///             will employ in managing file space.
-///\param       strategy - IN: Strategy for file space management
+///\param       strategy  - IN: Strategy for file space management
+///\param       persist   - IN: Whether to persist free-space
 ///\param       threshold - IN: Free-space section threshold. The library
 ///             default is 1, which is to track all free-space sections.
 ///\exception   H5::PropListIException
@@ -325,6 +326,9 @@ void FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbo
 // Function:    FileCreatPropList::getFileSpaceStrategy
 ///\brief       Retrieves the strategy, persist, and threshold that the library
 ///             uses in managing file space.
+///\param       strategy  - OUT: Strategy for file space management
+///\param       persist   - OUT: Whether to persist free-space
+///\param       threshold - OUT: Free-space section threshold
 ///\exception   H5::PropListIException
 // Programmer   Binh-Minh Ribler - Feb, 2017
 //--------------------------------------------------------------------------
@@ -341,6 +345,7 @@ void FileCreatPropList::getFileSpaceStrategy(H5F_fspace_strategy_t& strategy, hb
 //--------------------------------------------------------------------------
 // Function:    FileCreatPropList::setFileSpacePagesize
 ///\brief       Sets the file space page size for paged aggregation.
+///\param       fsp_psize - IN: Filespace's page size
 ///\exception   H5::PropListIException
 // Programmer   Binh-Minh Ribler - Feb, 2017
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5FloatType.cpp b/c++/src/H5FloatType.cpp
index 5902cbe..f573add 100644
--- a/c++/src/H5FloatType.cpp
+++ b/c++/src/H5FloatType.cpp
@@ -95,11 +95,12 @@ FloatType::FloatType(const DataSet& dataset) : AtomType()
 // Function:    FloatType overloaded constructor
 ///\brief       Creates an FloatType instance by opening an HDF5 float datatype
 ///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Float type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openFloatType(const char*)
 //              to improve usability.
 //              -BMR, Dec 2016
@@ -113,11 +114,12 @@ FloatType::FloatType(const H5Location& loc, const char *dtype_name) : AtomType()
 // Function:    FloatType overloaded constructor
 ///\brief       Creates an FloatType instance by opening an HDF5 float datatype
 ///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Float type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openFloatType(const H5std_string&)
 //              to improve usability.
 //              -BMR, Dec 2016
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index bb9e05d..66e2339 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -66,6 +66,9 @@ Group::Group(const Group& original) : H5Object(), CommonFG(), id(original.id)
 //--------------------------------------------------------------------------
 // Function:    Group::getObjId
 ///\brief       Opens an object via object header.
+///\param       obj_name - IN: Path to the object
+///\param       plist    - IN: Access property list for the link pointing to
+///                            the object
 ///\exception   H5::FileIException or H5::GroupIException
 ///\par Description
 ///             This function opens an object in a group or file, using
@@ -88,6 +91,8 @@ hid_t Group::getObjId(const char* obj_name, const PropList& plist) const
 ///\brief       This is an overloaded member function, provided for convenience.
 ///             It takes a reference to a \c H5std_string for the object's name.
 ///\param       obj_name - IN: Path to the object
+///\param       plist    - IN: Access property list for the link pointing to
+///                            the object
 ///\exception   H5::FileIException or H5::GroupIException
 // Programmer   Binh-Minh Ribler - March, 2017
 //--------------------------------------------------------------------------
@@ -159,15 +164,19 @@ Group::Group(const H5Location& loc, const void* ref, H5R_type_t ref_type, const
 
 //--------------------------------------------------------------------------
 // Function:    Group overload constructor - dereference
-///\brief       Given a reference, ref, to an hdf5 group, creates a Group object
-///\param       attr - IN: Specifying location where the referenced object is in
-///\param       ref - IN: Reference pointer
-///\param       ref_type - IN: Reference type - default to H5R_OBJECT
-///\param       plist - IN: Property list - default to PropList::DEFAULT
-///\exception   H5::ReferenceException
+// brief        Given a reference, ref, to an hdf5 group, creates a Group objec
+// param        attr - IN: Specifying location where the referenced object is i
+// param        ref - IN: Reference pointer
+// param        ref_type - IN: Reference type - default to H5R_OBJECT
+// param        plist - IN: Property list - default to PropList::DEFAULT
+// exception    H5::ReferenceException
 // Programmer   Binh-Minh Ribler - Oct, 2006
+// Modification
+//      Mar, 2017
+//              Removed in 1.10.1 because H5Location is Attribute's baseclass
+//              now. -BMR
 //--------------------------------------------------------------------------
- /* Group::Group(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), id(H5I_INVALID_HID)
+/* Group::Group(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), id(H5I_INVALID_HID)
 {
     id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
 }
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index 0f44eb9..c8b2961 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -52,6 +52,7 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
 
         // 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);
+        // Removed in 1.10.1, because H5Location is baseclass
 //        Group(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
 
         // Opens an object within a group or a file, i.e., root group.
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index 0bcc67a..122479f 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -24,6 +24,7 @@
 
 namespace H5 {
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 // This flag indicates whether H5Library::initH5cpp has been called to register
 // the terminating functions with atexit()
 bool IdComponent::H5cppinit = false;
@@ -32,6 +33,7 @@ bool IdComponent::H5cppinit = false;
 // Subclasses that have global constants use it.  This is a temporary
 // work-around in 1.8.16.  It will be removed after HDFFV-9540 is fixed.
 bool IdComponent::H5dontAtexit_called = false;
+#endif // DOXYGEN_SHOULD_SKIP_THIS
 
 //--------------------------------------------------------------------------
 // Function:    IdComponent::incRefCount
@@ -165,7 +167,7 @@ H5I_type_t IdComponent::getHDFObjType() const
 // Function:    getNumMembers (static)
 ///\brief       Returns the number of members of the given type.
 ///\return      Number of members
-///\Description
+///\par Description
 ///             If there is no member of the given type, getNumMembers will
 ///             return 0.  Valid types are:
 ///             \li \c H5I_FILE (= 1)
@@ -197,9 +199,9 @@ hsize_t IdComponent::getNumMembers(H5I_type_t type)
 // Function:    isValid (static)
 ///\brief       Checks if the given ID is valid.
 ///\return      true if the given identifier is valid, and false, otherwise.
-///\Description
+///\par Description
 ///             A valid ID is one that is in use and has an application
-///     reference count of at least 1.
+///             reference count of at least 1.
 // Programmer   Binh-Minh Ribler - Mar 1, 2017
 //--------------------------------------------------------------------------
 bool IdComponent::isValid(hid_t an_id)
@@ -219,7 +221,7 @@ bool IdComponent::isValid(hid_t an_id)
 ///\brief       Queries if a given type is currently registered with the
 ///             library.
 ///\return      true if the given type exists, and false, otherwise.
-///\Description
+///\par Description
 ///             Valid types are:
 ///             \li \c H5I_FILE (= 1)
 ///             \li \c H5I_GROUP
diff --git a/c++/src/H5IntType.cpp b/c++/src/H5IntType.cpp
index c64dae9..3aadcab 100644
--- a/c++/src/H5IntType.cpp
+++ b/c++/src/H5IntType.cpp
@@ -94,11 +94,12 @@ IntType::IntType(const DataSet& dataset) : AtomType()
 // Function:    IntType overloaded constructor
 ///\brief       Creates a IntType instance by opening an HDF5 integer datatype
 ///             given its name as a char*.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Integer type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openIntType(const char*) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -112,11 +113,12 @@ IntType::IntType(const H5Location& loc, const char *dtype_name) : AtomType()
 // Function:    IntType overloaded constructor
 ///\brief       Creates a IntType instance by opening an HDF5 integer datatype
 ///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Integer type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openArrayType(const H5std_string&)
 //              to improve usability.
 //              -BMR, Dec 2016
diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp
index 5a0bb73..79b353a 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -524,16 +524,19 @@ void H5Location::dereference(const H5Location& loc, const void* ref, H5R_type_t
 
 //--------------------------------------------------------------------------
 // Function:    H5Location::dereference
-///\brief       Dereferences a reference into an HDF5 object, given an attribute.
-///\param       attr - IN: Attribute specifying the location of the referenced object
-///\param       ref - IN: Reference pointer
-///\param       ref_type - IN: Reference type
-///\param       plist - IN: Property list - default to PropList::DEFAULT
-///\exception   H5::ReferenceException
+// brief        Dereferences a reference into an HDF5 object, given an attribute.
+// param        attr - IN: Attribute specifying the location of the referenced object
+// param        ref - IN: Reference pointer
+// param        ref_type - IN: Reference type
+// param        plist - IN: Property list - default to PropList::DEFAULT
+// exception    H5::ReferenceException
 // Programmer   Binh-Minh Ribler - Oct, 2006
 // Modification
 //      May, 2008
-//              Corrected missing parameters. - BMR
+//              Corrected missing parameters. -BMR
+//      Mar, 2017
+//              Removed in 1.10.1 because H5Location is Attribute's baseclass
+//              now. -BMR
 //--------------------------------------------------------------------------
  /* void H5Location::dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist)
 {
@@ -865,7 +868,7 @@ DataSet H5Location::createDataSet(const char* name, const DataType& data_type, c
 //--------------------------------------------------------------------------
 DataSet H5Location::createDataSet(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const DSetCreatPropList& create_plist) const
 {
-    return(createDataSet( name.c_str(), data_type, data_space, create_plist));
+    return(createDataSet(name.c_str(), data_type, data_space, create_plist));
 }
 
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index 3a0d8ca..48fc2b1 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -86,6 +86,7 @@ class H5_DLLCPP H5Location : public IdComponent {
         // Open a referenced object whose location is specified by either
         // a file, an HDF5 object, or an attribute.
         void dereference(const H5Location& loc, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
+        // Removed in 1.10.1, because H5Location is baseclass
         //void dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type = H5R_OBJECT, const PropList& plist = PropList::DEFAULT);
 
         // Retrieves a dataspace with the region pointed to selected.
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index b5d0f88..359fab2 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -51,7 +51,6 @@ extern "C" herr_t userAttrOpWrpr(hid_t loc_id, const char *attr_name,
    myData->op(*myData->location, s_attr_name, myData->opData);
    return 0;
 }
-#endif
 
 //--------------------------------------------------------------------------
 // Function:    H5Object default constructor (protected)
@@ -101,6 +100,7 @@ void f_Attribute_setId(Attribute* attr, hid_t new_id)
 {
     attr->p_setId(new_id);
 }
+#endif
 
 //--------------------------------------------------------------------------
 // Function:    H5Object::createAttribute
@@ -391,6 +391,8 @@ void H5Object::renameAttr(const H5std_string& oldname, const H5std_string& newna
 {
     renameAttr (oldname.c_str(), newname.c_str());
 }
+
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
 // Function:    getObjName
 ///\brief       Given an id, returns the type of the object.
@@ -502,7 +504,6 @@ ssize_t H5Object::getObjName(H5std_string& obj_name, size_t len) const
     return(name_size);
 }
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
 // Function:    H5Object destructor
 ///\brief       Noop destructor.
diff --git a/c++/src/H5OcreatProp.cpp b/c++/src/H5OcreatProp.cpp
index 6fdd9dc..9a3af7e 100644
--- a/c++/src/H5OcreatProp.cpp
+++ b/c++/src/H5OcreatProp.cpp
@@ -155,7 +155,7 @@ void ObjCreatPropList::getAttrPhaseChange(unsigned& max_compact, unsigned& min_d
 
 //--------------------------------------------------------------------------
 // Function:    ObjCreatPropList::setAttrCrtOrder
-///\brief       Sets tracking and indexing of attribute creation order.
+///\brief       Set the flags for creation order of attributes on an object
 ///\param       crt_order_flags  - IN: Flags specifying whether to track and
 ///                     index attribute creation order.  Default: No flag set
 ///\exception   H5::PropListIException
@@ -183,10 +183,9 @@ void ObjCreatPropList::setAttrCrtOrder(unsigned crt_order_flags) const
 
 //--------------------------------------------------------------------------
 // Function:    ObjCreatPropList::getAttrCrtOrder
-///\brief       Gets tracking and indexing settings for attribute
-///             creation order.
-///\param       crt_order_flags - OUT: Flags specifying whether to track and
-///                                    index attribute creation order
+///\brief       Returns the flags indicating creation order is tracked/indexed
+///             for attributes on an object.
+///\return      The flags
 ///\exception   H5::PropListIException
 ///\par Description
 ///             When no flag is set, i.e. crt_order_flags = 0, attribute
diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp
index 54981ab..db1cf04 100644
--- a/c++/src/H5StrType.cpp
+++ b/c++/src/H5StrType.cpp
@@ -148,11 +148,12 @@ StrType::StrType(const DataSet& dataset) : AtomType ()
 // Function:    StrType overloaded constructor
 ///\brief       Creates an StrType instance by opening an HDF5 string datatype
 ///             given its name, provided as a C character string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: String type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openStrType(const char*) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -166,11 +167,12 @@ StrType::StrType(const H5Location& loc, const char *dtype_name) : AtomType()
 // Function:    StrType overloaded constructor
 ///\brief       Creates an StrType instance by opening an HDF5 string datatype
 ///             given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: String type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openStrType(const H5std_string&)
 //              to improve usability.
 //              -BMR, Dec 2016
diff --git a/c++/src/H5VarLenType.cpp b/c++/src/H5VarLenType.cpp
index 7f50b9a..64029cc 100644
--- a/c++/src/H5VarLenType.cpp
+++ b/c++/src/H5VarLenType.cpp
@@ -76,11 +76,12 @@ VarLenType::VarLenType(const DataType* base_type) : DataType()
 // Function:    VarLenType overloaded constructor
 ///\brief       Creates an VarLenType instance by opening an HDF5 variable
 ///             length datatype given its name, provided as a C char*.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Variable length type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openVarLenType(const char*) to
 //              improve usability.
 //              -BMR, Dec 2016
@@ -94,11 +95,12 @@ VarLenType::VarLenType(const H5Location& loc, const char *dtype_name) : DataType
 // Function:    VarLenType overloaded constructor
 ///\brief       Creates an VarLenType instance by opening an HDF5 variable
 ///             length datatype given its name, provided as an \c H5std_string.
+///\param       loc        - IN: Location of the type
 ///\param       dtype_name - IN: Variable length type name
 ///\exception   H5::DataTypeIException
 // Programmer   Binh-Minh Ribler - Dec 2016
 // Description
-//              In 1.10.1, this constructor was introduced and will replace the
+//              In 1.10.1, this constructor was introduced and may replace the
 //              existing function CommonFG::openVarLenType(const H5std_string&)
 //              to improve usability.
 //              -BMR, Dec 2016
diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp
index 22db539..fee4115 100644
--- a/c++/test/ttypes.cpp
+++ b/c++/test/ttypes.cpp
@@ -272,9 +272,8 @@ static void test_query()
         tcpl.close();
         tid2.close();
 
-        // Open the datatypes for query
+        // Open the datatypes for query.  Testing both ways
 
-        // Deprecated functions
         tid1 = file.openCompType(CompT_NAME);
         tid1.close();
         tid2 = file.openEnumType(EnumT_NAME);