Merge pull request #1106 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.8/master to 1.8/masterhdf5-1_8_21

* commit '664186b91d9198915baca4c6dca3f7b03695d316': (124 commits)
  Commit HDF5 1.8.21 release version strings.
  Update INSTALL and INSTALL_parallel files to remove references to ancient systems and add generic steps for building HDF5 on HPC clusters.
  Update various INSTALL files for 1.8.21 release.
  Add missing space and correct typo.
  Modified a section for newly supported systems and compilers (vs. 1.8.20 release); Brought edits for tools bug fixes from 1.10.2 RELEASE.txt as we agreed with Allen.
  It is my test under Larry's guidance.
  Remove build directory which was unintentionally committed.
  Updated MANIFEST
  Switch default build mode to production. Update version to 1.8.21 in anticipation of release.
  Fixed EED-319 Description:     Added an html version for the C++ function mapping table and removed     the single web page version.     Updated cpp_doc_config to use the html file.     Fixed some typos.     Running "doxygen cpp_doc_config" successfully.
  HDFFV-10473 fix HDFFV-10398 attribute location
  Add missing C++ entries to RELEASE.txt.
  pre1 release.
  Add missing RELEASE.txt entries for C++.
  Update Windows test machines
  Fix soversion naming and update cmake scripts
  Update version in RELEASE.txt. Correct merge errors from hdf5_1_8.
  Fixed typos
  Fixed typos
  Fixed typos
  ...

1 files changed, 623 insertions, 313 deletions

diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp
index afeaca7..c62437c 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -18,13 +18,21 @@
 #include "H5Exception.h"
 #include "H5IdComponent.h"
 #include "H5PropList.h"
+#include "H5FaccProp.h"
+#include "H5FcreatProp.h"
+#include "H5OcreatProp.h"
+#include "H5DcreatProp.h"
+#include "H5StrcreatProp.h"
+#include "H5LcreatProp.h"
 #include "H5LaccProp.h"
 #include "H5Location.h"
 #include "H5Object.h"
 #include "H5DataType.h"
 #include "H5DataSpace.h"
 #include "H5AbstractDs.h"
-#include "H5Attribute.h"
+#include "H5CommonFG.h"
+#include "H5Group.h"
+#include "H5File.h"
 
 namespace H5 {
 
@@ -87,129 +95,15 @@ H5Location::H5Location() : IdComponent() {}
                            Notes for H5A wrappers
                            ======================
 May, 2017 (1.8.19)
-        These H5A wrappers are copied to H5Object to prevent an attribute
+        The H5A wrappers are copied to H5Object to prevent an attribute
         id being passed in to H5A APIs.  The original H5A wrapper functions
         here will be deprecated in future releases.
+May, 2018 (1.8.21)
+        They are removed from 1.8.21
 
 ***************************************************************************/
 
 //--------------------------------------------------------------------------
-// Function:    H5Location::createAttribute
-///\brief       Deprecated - replaced by H5Object::createAttribute
-//  brief       Creates an attribute for a group, dataset, or named datatype.
-///\param       name - IN: Name of the attribute
-///\param       data_type - IN: Datatype for the attribute
-///\param       data_space - IN: Dataspace for the attribute - only simple
-///             dataspaces are allowed at this time
-///\param       create_plist - IN: Creation property list - default to
-///             PropList::DEFAULT
-///\return      Attribute instance
-///\exception   H5::AttributeIException
-///\par Description
-///             The attribute name specified in \a name must be unique.
-///             Attempting to create an attribute with the same name as an
-///             existing attribute will raise an exception, leaving the
-///             pre-existing attribute intact. To overwrite an existing
-///             attribute with a new attribute of the same name, first
-///             delete the existing one with \c H5Location::removeAttr, then
-///             recreate it with this function.
-// Programmer   Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Attribute H5Location::createAttribute(const char* name, const DataType& data_type, const DataSpace& data_space, const PropList& create_plist) const
-{
-    hid_t type_id = data_type.getId();
-    hid_t space_id = data_space.getId();
-    hid_t plist_id = create_plist.getId();
-    hid_t attr_id = H5Acreate2(getId(), name, type_id, space_id, plist_id, H5P_DEFAULT);
-
-    // If the attribute id is valid, create and return the Attribute object
-    if(attr_id > 0)
-    {
-        Attribute attr;
-        f_Attribute_setId(&attr, attr_id);
-        return(attr);
-    }
-    else
-        throw AttributeIException(inMemFunc("createAttribute"), "H5Acreate2 failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::createAttribute
-///\brief       Deprecated - replaced by H5Object::createAttribute
-//  brief       This is an overloaded member function, provided for convenience.
-///             It differs from the above function in that it takes
-///             a reference to an \c H5std_string for \a name.
-// Programmer   Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Attribute H5Location::createAttribute(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const PropList& create_plist) const
-{
-    return(createAttribute(name.c_str(), data_type, data_space, create_plist));
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::openAttribute
-///\brief       Deprecated - replaced by H5Object::openAttribute
-//  brief       Opens an attribute given its name.
-///\param       name - IN: Name of the attribute
-///\return      Attribute instance
-///\exception   H5::AttributeIException
-// Programmer   Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Attribute H5Location::openAttribute(const char* name) const
-{
-    hid_t attr_id = H5Aopen(getId(), name, H5P_DEFAULT);
-    if(attr_id > 0)
-    {
-        Attribute attr;
-        f_Attribute_setId(&attr, attr_id);
-        return(attr);
-    }
-    else
-    {
-        throw AttributeIException(inMemFunc("openAttribute"), "H5Aopen failed");
-    }
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::openAttribute
-///\brief       Deprecated - replaced by H5Object::openAttribute
-//  brief       This is an overloaded member function, provided for convenience.
-//              It differs from the above function in that it takes
-//              a reference to an \c H5std_string for \a name.
-///\param       name - IN: Name of the attribute
-// Programmer   Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Attribute H5Location::openAttribute(const H5std_string& name) const
-{
-    return(openAttribute(name.c_str()));
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::openAttribute
-///\brief       Deprecated - replaced by H5Object::openAttribute
-//  brief       Opens an attribute given its index.
-///\param       idx - IN: Index of the attribute, a 0-based, non-negative integer
-///\return      Attribute instance
-///\exception   H5::AttributeIException
-// Programmer   Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-Attribute H5Location::openAttribute(const unsigned int idx) const
-{
-    hid_t attr_id = H5Aopen_by_idx(getId(), ".", H5_INDEX_CRT_ORDER,
-                H5_ITER_INC, static_cast<hsize_t>(idx), H5P_DEFAULT, H5P_DEFAULT);
-    if(attr_id > 0)
-    {
-        Attribute attr;
-        f_Attribute_setId(&attr, attr_id);
-        return(attr);
-    }
-    else
-    {
-        throw AttributeIException(inMemFunc("openAttribute"), "H5Aopen_by_idx failed");
-    }
-}
-
-//--------------------------------------------------------------------------
 // Function:    H5Location::iterateAttrs
 ///\brief       Iterates a user's function over all the attributes of an H5
 ///             object, which may be a group, dataset or named datatype.
@@ -225,7 +119,6 @@ Attribute H5Location::openAttribute(const unsigned int idx) const
 ///             For information, please refer to the C layer Reference Manual
 ///             at:
 /// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5A.html#Annot-Iterate
-// Programmer   Binh-Minh Ribler - 2000
 //--------------------------------------------------------------------------
 int H5Location::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_data)
 {
@@ -255,121 +148,21 @@ int H5Location::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_d
 }
 
 //--------------------------------------------------------------------------
-// Function:    H5Location::attrExists
-///\brief       Deprecated - replaced by H5Object::attrExists()
-//  brief       Checks whether the named attribute exists at this location.
-///\param       name - IN: Name of the attribute to be queried
-///\exception   H5::AttributeIException
-// Programmer   Binh-Minh Ribler - 2013
-//--------------------------------------------------------------------------
-bool H5Location::attrExists(const char* name) const
-{
-    // Call C routine H5Aexists to determine whether an attribute exists
-    // at this location, which could be specified by a file, group, dataset,
-    // or named datatype.
-    herr_t ret_value = H5Aexists(getId(), name);
-    if(ret_value > 0)
-        return true;
-    else if(ret_value == 0)
-        return false;
-    else // Raise exception when H5Aexists returns a negative value
-        throw AttributeIException(inMemFunc("attrExists"), "H5Aexists failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::attrExists
-///\brief       Deprecated - replaced by H5Object::attrExists()
-//  brief       This is an overloaded member function, provided for convenience.
-//              It differs from the above function in that it takes
-//              a reference to an \c H5std_string for \a name.
-///\param       name - IN: Name of the attribute to be queried
-// Programmer   Binh-Minh Ribler - 2013
-//--------------------------------------------------------------------------
-bool H5Location::attrExists(const H5std_string& name) const
-{
-    return(attrExists(name.c_str()));
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::removeAttr
-///\brief       Deprecated - replaced by H5Object::removeAttr()
-//  brief       Removes the named attribute from this object.
-///\param       name - IN: Name of the attribute to be removed
-///\exception   H5::AttributeIException
-// Programmer   Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void H5Location::removeAttr(const char* name) const
-{
-    herr_t ret_value = H5Adelete(getId(), name);
-    if(ret_value < 0)
-        throw AttributeIException(inMemFunc("removeAttr"), "H5Adelete failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::removeAttr
-///\brief       Deprecated - replaced by H5Object::removeAttr()
-//  brief       This is an overloaded member function, provided for convenience.
-//              It differs from the above function in that it takes
-//              a reference to an \c H5std_string for \a name.
-///\param       name - IN: Name of the attribute to be removed
-// Programmer   Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void H5Location::removeAttr(const H5std_string& name) const
-{
-    removeAttr(name.c_str());
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::renameAttr
-///\brief       Deprecated - replaced by H5Object::renameAttr()
-//  brief       Renames the named attribute from this object.
-///\param       oldname - IN: Name of the attribute to be renamed
-///\param       newname - IN: New name ame of the attribute
-///\exception   H5::AttributeIException
-// Programmer   Binh-Minh Ribler - Mar, 2005
-//--------------------------------------------------------------------------
-void H5Location::renameAttr(const char* oldname, const char* newname) const
-{
-    herr_t ret_value = H5Arename(getId(), oldname, newname);
-    if (ret_value < 0)
-        throw AttributeIException(inMemFunc("renameAttr"), "H5Arename failed");
-}
-
-//--------------------------------------------------------------------------
-// Function:    H5Location::renameAttr
-///\brief       Deprecated - replaced by H5Object::renameAttr()
-//  brief       This is an overloaded member function, provided for convenience.
-//              It differs from the above function in that it takes
-//              a reference to an \c H5std_string for the names.
-//
-///\param       oldname - IN: Name of the attribute to be renamed
-///\param       newname - IN: New name ame of the attribute
-///\exception   H5::AttributeIException
-// Programmer   Binh-Minh Ribler - Mar, 2005
-//--------------------------------------------------------------------------
-void H5Location::renameAttr(const H5std_string& oldname, const H5std_string& newname) const
-{
-   renameAttr (oldname.c_str(), newname.c_str());
-}
-
-//--------------------------------------------------------------------------
 // Function:    H5Location::getNumAttrs
-///\brief       Deprecated - replaced by H5Object::getNumAttrs()
-//  brief       Returns the number of attributes attached to this HDF5 object.
+///\brief       Returns the number of attributes attached to an HDF5 object.
 ///\return      Number of attributes
 ///\exception   H5::AttributeIException
-// Programmer   Binh-Minh Ribler - 2000
 // Modification
-//          - Moved to H5Object in 1.8.20. -BMR
+//          - Moved from H5Object to allow passing an attribute id to the
+//            C API, in 1.8.20.
 //--------------------------------------------------------------------------
 int H5Location::getNumAttrs() const
 {
-   H5O_info_t objinfo;    /* Object info */
+    H5O_info_t objinfo;    /* Object info */
 
     if(H5Oget_info(getId(), &objinfo) < 0)
-        throw AttributeIException(inMemFunc("getNumAttrs"), "H5Oget_info failed");
-    else
-        return(static_cast<int>(objinfo.num_attrs));
+        throwException("getNumAttrs", "H5Oget_info failed");
+    return(static_cast<int>(objinfo.num_attrs));
 }
 
 //--------------------------------------------------------------------------
@@ -377,9 +170,13 @@ int H5Location::getNumAttrs() const
 ///\brief       Checks if a link of a given name exists in a location.
 ///\param       name - IN: Searched name - \c char*
 ///\param       lapl - IN: Link access property list
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - Nov, 2016
-// Modification
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// December 2016
 //--------------------------------------------------------------------------
 bool H5Location::nameExists(const char* name, const LinkAccPropList& lapl) const
 {
@@ -390,7 +187,7 @@ bool H5Location::nameExists(const char* name, const LinkAccPropList& lapl) const
         return false;
     else // Raise exception when H5Lexists returns a negative value
     {
-        throw LocationException(inMemFunc("nameExists"), "H5Lexists failed");
+        throwException("nameExists", "H5Lexists failed");
     }
 }
 
@@ -399,9 +196,13 @@ bool H5Location::nameExists(const char* name, const LinkAccPropList& lapl) const
 ///\brief       Checks if a link of a given name exists in a location.
 ///\param       name - IN: Searched name - \c H5std_string
 ///\param       lapl - IN: Link access property list
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - Dec, 2016
-// Modification
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// December 2016
 //--------------------------------------------------------------------------
 bool H5Location::nameExists(const H5std_string& name, const LinkAccPropList& lapl) const
 {
@@ -415,10 +216,15 @@ bool H5Location::nameExists(const H5std_string& name, const LinkAccPropList& lap
 ///             which can be either of these values:
 ///             \li \c H5F_SCOPE_GLOBAL - Flushes the entire virtual file
 ///             \li \c H5F_SCOPE_LOCAL - Flushes only the specified file
-///\exception   H5::LocationException
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
 ///\par Description
 ///             This location is used to identify the file to be flushed.
-// Programmer   Binh-Minh Ribler - 2012
+// December 2005
 // Modification
 //      Sep 2012 - BMR
 //              Moved from H5File/H5Object
@@ -428,7 +234,7 @@ void H5Location::flush(H5F_scope_t scope) const
     herr_t ret_value = H5Fflush(getId(), scope);
     if(ret_value < 0)
     {
-        throw LocationException(inMemFunc("flush"), "H5Fflush failed");
+        throwException("flush", "H5Fflush failed");
     }
 }
 
@@ -436,39 +242,56 @@ void H5Location::flush(H5F_scope_t scope) const
 // Function:    H5Location::getFileName
 ///\brief       Gets the name of the file, in which this HDF5 object belongs.
 ///\return      File name
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - Jul, 2004
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// July 2004
 //--------------------------------------------------------------------------
 H5std_string H5Location::getFileName() const
 {
     try {
         return(p_get_file_name());
     }
-    catch (LocationException& E) {
-        throw FileIException(inMemFunc("getFileName"), E.getDetailMsg());
+    catch (IdComponentException& E) {
+        throwException("getFileName", E.getDetailMsg());
     }
 }
 
 //--------------------------------------------------------------------------
 // Function:    H5Location::getObjectInfo
 ///\brief       Retrieve information about an object, specified by location.
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - Aug, 2017
+///
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// August 2017
 //--------------------------------------------------------------------------
 void H5Location::getObjectInfo(H5O_info_t *objinfo) const
 {
     herr_t ret_value = H5Oget_info(getId(), objinfo);
     if (ret_value < 0)
     {
-        throw LocationException(inMemFunc("getObjectInfo"), "H5Oget_info failed");
+        throwException("getObjectInfo", "H5Oget_info failed");
     }
 }
 
 //--------------------------------------------------------------------------
 // Function:    H5Location::getObjectInfo
 ///\brief       Retrieve information about an object, specified by name.
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - Aug, 2017
+///
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// August 2017
 //--------------------------------------------------------------------------
 void H5Location::getObjectInfo(const char *name, H5O_info_t *objinfo,
                         const LinkAccPropList& lapl) const
@@ -476,15 +299,21 @@ void H5Location::getObjectInfo(const char *name, H5O_info_t *objinfo,
     herr_t ret_value = H5Oget_info_by_name(getId(), name, objinfo, lapl.getId());
     if (ret_value < 0)
     {
-        throw LocationException(inMemFunc("getObjectInfo"), "H5Oget_info_by_name failed");
+        throwException("getObjectInfo", "H5Oget_info_by_name failed");
     }
 }
 
 //--------------------------------------------------------------------------
 // Function:    H5Location::getObjectInfo
 ///\brief       Retrieve information about an object, specified by name.
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - Aug, 2017
+///
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// August 2017
 //--------------------------------------------------------------------------
 void H5Location::getObjectInfo(const H5std_string& name, H5O_info_t *objinfo,
                         const LinkAccPropList& lapl) const
@@ -492,7 +321,7 @@ void H5Location::getObjectInfo(const H5std_string& name, H5O_info_t *objinfo,
     herr_t ret_value = H5Oget_info_by_name(getId(), name.c_str(), objinfo, lapl.getId());
     if (ret_value < 0)
     {
-        throw LocationException(inMemFunc("getObjectInfo"), "H5Oget_info_by_name failed");
+        throwException("getObjectInfo", "H5Oget_info_by_name failed");
     }
 }
 
@@ -502,11 +331,16 @@ void H5Location::getObjectInfo(const H5std_string& name, H5O_info_t *objinfo,
 ///\return      Object version, which can have the following values:
 ///             \li \c H5O_VERSION_1
 ///             \li \c H5O_VERSION_2
-///\exception   H5::LocationException
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
 ///             Exception will be thrown when:
 ///             - an error returned by the C API
 ///             - version number is not one of the valid values above
-// Programmer   Binh-Minh Ribler - May, 2017
+// August 2017
 //--------------------------------------------------------------------------
 unsigned H5Location::objVersion() const
 {
@@ -518,13 +352,13 @@ unsigned H5Location::objVersion() const
 
     // Throw exception if C API returns failure
     if (ret_value < 0)
-        throw LocationException(inMemFunc("objVersion"), "H5Oget_info failed");
+        throwException("objVersion", "H5Oget_info failed");
     // Return a valid version or throw an exception for invalid value
     else
     {
         version = objinfo.hdr.version;
         if (version != H5O_VERSION_1 && version != H5O_VERSION_2)
-            throw LocationException(inMemFunc("objVersion"), "Invalid version for object");
+            throwException("objVersion", "Invalid version for object");
     }
     return(version);
 }
@@ -534,7 +368,12 @@ unsigned H5Location::objVersion() const
 ///\brief       Sets or resets the comment for an object specified by its name.
 ///\param       name  - IN: Name of the object
 ///\param       comment - IN: New comment
-///\exception   H5::LocationException
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
 ///\par Description
 ///             If \a comment is an empty string or a null pointer, the comment
 ///             message is removed from the object.
@@ -542,18 +381,15 @@ unsigned H5Location::objVersion() const
 ///             strings.  They can be attached to any object that has an
 ///             object header, e.g., data sets, groups, named data types,
 ///             and data spaces, but not symbolic links.
-// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+// July 2004
 // Modification
-//      2007: QAK modified to use H5O APIs; however the first parameter is
-//              no longer just file or group, this function should be moved
-//              to another class to accommodate attribute, dataset, and named
-//              datatype. - BMR
+//      Moved from CommonFG, Sep 2013
 //--------------------------------------------------------------------------
 void H5Location::setComment(const char* name, const char* comment) const
 {
     herr_t ret_value = H5Oset_comment_by_name(getId(), name, comment, H5P_DEFAULT);
     if(ret_value < 0)
-        throw LocationException(inMemFunc("setComment"), "H5Oset_comment_by_name failed");
+        throwException("setComment", "H5Oset_comment_by_name failed");
 }
 
 //--------------------------------------------------------------------------
@@ -561,7 +397,9 @@ void H5Location::setComment(const char* name, const char* comment) const
 ///\brief       This is an overloaded member function, provided for convenience.
 ///             It differs from the above function in that it takes an
 ///             \c H5std_string for \a name and \a comment.
-// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+// July 2004
+// Modification
+//      Moved from CommonFG, Sep 2013
 //--------------------------------------------------------------------------
 void H5Location::setComment(const H5std_string& name, const H5std_string& comment) const
 {
@@ -573,14 +411,19 @@ void H5Location::setComment(const H5std_string& name, const H5std_string& commen
 ///\brief       This is an overloaded member function, provided for convenience.
 ///             It differs from the above function in that it doesn't take
 ///             an object name.
-// Programmer   Binh-Minh Ribler - Sep 2013
-// Modification
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// Sep 2013
 //--------------------------------------------------------------------------
 void H5Location::setComment(const char* comment) const
 {
     herr_t ret_value = H5Oset_comment_by_name(getId(), ".", comment, H5P_DEFAULT);
     if(ret_value < 0)
-        throw LocationException(inMemFunc("setComment"), "H5Oset_comment_by_name failed");
+        throwException("setComment", "H5Oset_comment_by_name failed");
 }
 
 //--------------------------------------------------------------------------
@@ -588,7 +431,7 @@ void H5Location::setComment(const char* comment) const
 ///\brief       This is an overloaded member function, provided for convenience.
 ///             It differs from the above function in that it takes an
 ///             \c H5std_string for \a comment.
-// Programmer   Binh-Minh Ribler - Sep 2013
+// Sep 2013
 //--------------------------------------------------------------------------
 void H5Location::setComment(const H5std_string& comment) const
 {
@@ -599,18 +442,21 @@ void H5Location::setComment(const H5std_string& comment) const
 // Function:    H5Location::removeComment
 ///\brief       Removes the comment from an object specified by its name.
 ///\param       name  - IN: Name of the object
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013)
-//      2007: QAK modified to use H5O APIs; however the first parameter is
-//              no longer just file or group, this function should be moved
-//              to another class to accommodate attribute, dataset, and named
-//              datatype. - BMR
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// July 2004
+// Modification
+//      Moved from CommonFG, Sep 2013
 //--------------------------------------------------------------------------
 void H5Location::removeComment(const char* name) const
 {
     herr_t ret_value = H5Oset_comment_by_name(getId(), name, NULL, H5P_DEFAULT);
     if(ret_value < 0)
-        throw LocationException(inMemFunc("removeComment"), "H5Oset_comment_by_name failed");
+        throwException("removeComment", "H5Oset_comment_by_name failed");
 }
 
 //--------------------------------------------------------------------------
@@ -618,11 +464,13 @@ void H5Location::removeComment(const char* name) const
 ///\brief       This is an overloaded member function, provided for convenience.
 ///             It differs from the above function in that it takes an
 ///             \c H5std_string for \a name.
-// Programmer   Binh-Minh Ribler - May 2005 (moved from CommonFG, Sep 2013)
+// July 2004
+// Modification
+//      Moved from CommonFG, Sep 2013
 //--------------------------------------------------------------------------
 void H5Location::removeComment(const H5std_string& name) const
 {
-    removeComment (name.c_str());
+    removeComment(name.c_str());
 }
 
 //--------------------------------------------------------------------------
@@ -632,13 +480,18 @@ void H5Location::removeComment(const H5std_string& name) const
 ///\param       buf_size - IN: Length of the comment to retrieve
 ///\param       comment  - OUT: Retrieved comment
 ///\return      Actual length of the comment
-///\exception   H5::LocationException
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
 ///\par Description
 ///             This function retrieves \a buf_size characters of the comment
 ///             including the null terminator.  Thus, if the actual length
 ///             of the comment is more than buf_size-1, the retrieved comment
 ///             will be truncated to accommodate the null terminator.
-// Programmer   Binh-Minh Ribler - Mar 2014
+// March 2014
 //--------------------------------------------------------------------------
 ssize_t H5Location::getComment(const char* name, size_t buf_size, char* comment) const
 {
@@ -650,7 +503,7 @@ ssize_t H5Location::getComment(const char* name, size_t buf_size, char* comment)
     // If H5Oget_comment_by_name returns a negative value, raise an exception
     if (comment_len < 0)
     {
-        throw LocationException(inMemFunc("getComment"), "H5Oget_comment_by_name failed");
+        throwException("getComment", "H5Oget_comment_by_name failed");
     }
     // If the comment is longer than the provided buffer size, the C library
     // will not null terminate it
@@ -668,8 +521,15 @@ ssize_t H5Location::getComment(const char* name, size_t buf_size, char* comment)
 ///\param       name     - IN: Name of the object
 ///\param       buf_size - IN: Length of the comment to retrieve, default to 0
 ///\return      Comment string
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// July 2004
+// Modification
+//      Moved from CommonFG, Sep 2013
 //--------------------------------------------------------------------------
 H5std_string H5Location::getComment(const char* name, size_t buf_size) const
 {
@@ -683,7 +543,7 @@ H5std_string H5Location::getComment(const char* name, size_t buf_size) const
     // If H5Oget_comment_by_name returns a negative value, raise an exception
     if (comment_len < 0)
     {
-        throw LocationException(inMemFunc("getComment"), "H5Oget_comment_by_name failed");
+        throwException("getComment", "H5Oget_comment_by_name failed");
     }
 
     // If comment exists, calls C routine again to get it
@@ -704,7 +564,7 @@ H5std_string H5Location::getComment(const char* name, size_t buf_size) const
         if (temp_len < 0)
         {
             delete []comment_C;
-            throw LocationException(inMemFunc("getComment"), "H5Oget_comment_by_name failed");
+            throwException("getComment", "H5Oget_comment_by_name failed");
         }
 
         // Convert the C comment to return
@@ -723,7 +583,15 @@ H5std_string H5Location::getComment(const char* name, size_t buf_size) const
 ///\brief       This is an overloaded member function, provided for convenience.
 ///             It differs from the above function in that it takes an
 ///             \c H5std_string for \a name.
-// Programmer   Binh-Minh Ribler - 2000 (moved from CommonFG, Sep 2013)
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// July 2004
+// Modification
+//      Moved from CommonFG, Sep 2013
 //--------------------------------------------------------------------------
 H5std_string H5Location::getComment(const H5std_string& name, size_t buf_size) const
 {
@@ -734,21 +602,25 @@ H5std_string H5Location::getComment(const H5std_string& name, size_t buf_size) c
 // Function:    H5Location::openObjId
 ///\brief       Opens an object without knowing the object type.
 ///\param       obj_name - IN: Path to the object
-///\param       lapl     - IN: Access property list for the link pointing
-///                            to the object
-///\exception   H5::LocationException
+///\param       lapl     - IN: Access plist for the link pointing to the object
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
 ///\par Description
 ///             This function opens an object at this location, using
 ///             H5Oopen.  Thus, an object can be opened without knowing
-///             the object's type.
-// Programmer   Binh-Minh Ribler - May, 2017
+///             its type.
+// May 2017
 //--------------------------------------------------------------------------
 hid_t H5Location::openObjId(const char* obj_name, const LinkAccPropList& lapl) const
 {
     hid_t ret_value = H5Oopen(getId(), obj_name, lapl.getId());
     if (ret_value < 0)
     {
-        throw LocationException(inMemFunc("openObjId"), "H5Oopen failed");
+        throwException("openObjId", "H5Oopen failed");
     }
     return(ret_value);
 }
@@ -760,8 +632,13 @@ hid_t H5Location::openObjId(const char* obj_name, const LinkAccPropList& lapl) c
 ///\param       obj_name - IN: Path to the object
 ///\param       lapl     - IN: Access property list for the link pointing to
 ///                            the object
-///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - May, 2017
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+// May 2017
 //--------------------------------------------------------------------------
 hid_t H5Location::openObjId(const H5std_string& obj_name, const LinkAccPropList& lapl) const
 {
@@ -773,14 +650,14 @@ hid_t H5Location::openObjId(const H5std_string& obj_name, const LinkAccPropList&
 ///\brief       Closes an object, which was opened with H5Location::openObjId
 ///
 ///\exception   H5::LocationException
-// Programmer   Binh-Minh Ribler - May, 2017
+// May 2017
 //--------------------------------------------------------------------------
-void H5Location::closeObjId(hid_t obj_id) const
+void H5Location::closeObjId(hid_t obj_id)
 {
     herr_t ret_value = H5Oclose(obj_id);
     if (ret_value < 0)
     {
-        throw LocationException(inMemFunc("closeObjId"), "H5Oclose failed");
+        throw LocationException("closeObjId", "H5Oclose failed");
     }
 }
 
@@ -945,20 +822,23 @@ 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
-///\exception   H5::ReferenceException
-// Programmer   Binh-Minh Ribler - Oct, 2006
+// 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
+// exception    H5::ReferenceException
+// October 2006
 // Modification
 //      May, 2008
 //              Corrected missing parameters. - BMR
+//      May, 2018
+//              Removed in 1.8.21 because H5Location is Attribute's baseclass
+//              now. -BMR
 //--------------------------------------------------------------------------
-void H5Location::dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type)
-{
-    p_setId(p_dereference(attr.getId(), ref, ref_type, "dereference"));
-}
+//void H5Location::dereference(const Attribute& attr, const void* ref, H5R_type_t ref_type)
+//{
+    //p_setId(p_dereference(attr.getId(), ref, ref_type, "dereference"));
+//}
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
@@ -1113,6 +993,444 @@ DataSpace H5Location::getRegion(void *ref, H5R_type_t ref_type) const
 }
 
 //--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       Creates a soft link from \a link_name to \a target_name.
+///\param       target_name - IN: Name of object, can be a non-existing object
+///\param       link_name   - IN: Link name for the target name
+///\param       lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
+///\param       lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+///\par Description
+///             Note that both names are interpreted relative to the current
+///             location.
+///             For information on creating a soft link, please refer to the
+///             H5Lcreate_soft APIs in the HDF5 C Reference Manual.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::link(const char *target_name, const char *link_name,
+             const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
+{
+    herr_t ret_value = -1;
+    hid_t lcpl_id = lcpl.getId();
+    hid_t lapl_id = lapl.getId();
+
+    ret_value = H5Lcreate_soft(target_name, getId(), link_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("link", "creating soft link failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a target_name and \a link_name.
+// May 2018
+//--------------------------------------------------------------------------
+void H5Location::link(const H5std_string& target_name,
+     const H5std_string& link_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    link(target_name.c_str(), link_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       Creates a hard link from \a new_name to \a curr_name.
+///\param       curr_name - IN: Name of the existing object
+///\param       new_loc   - IN: New location
+///\param       new_name  - IN: New name for the object
+///\param       lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
+///\param       lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+///\par Description
+///             Note that both names are interpreted relative to the
+///             specified location.
+///             For information on creating a hard link, please refer to the
+///             H5Lcreate_hard APIs in the HDF5 C Reference Manual.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::link(const char *curr_name, const H5Location& new_loc,
+     const char *new_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    herr_t ret_value = -1;
+    hid_t new_loc_id = new_loc.getId();
+    hid_t lcpl_id = lcpl.getId();
+    hid_t lapl_id = lapl.getId();
+
+    ret_value = H5Lcreate_hard(getId(), curr_name, new_loc.getId(), new_name, lcpl_id, lapl_id);
+   if (ret_value < 0)
+        throwException("link", "creating link failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a curr_name and \a new_name.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::link(const H5std_string& curr_name, const H5Location& new_loc,
+     const H5std_string& new_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    link(curr_name.c_str(), new_loc, new_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       Creates a hard link from \a new_name to \a curr_name - can be
+///             used to pass in H5L_SAME_LOC.
+///\param       curr_name - IN: Name of the existing object
+///\param       same_loc  - IN: Location ID, or H5L_SAME_LOC
+///\param       new_name  - IN: New name for the link
+///\param       lcpl - IN: Link creation plist - default to LinkCreatPropList::DEFAULT
+///\param       lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+///\par Description
+///             Note that both names are interpreted relative to the
+///             specified location.
+///             For information on creating a hard link, please refer to the
+///             H5Lcreate_hard APIs in the HDF5 C Reference Manual.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::link(const char *curr_name, const hid_t same_loc,
+     const char *new_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    herr_t ret_value = -1;
+    hid_t lcpl_id = lcpl.getId();
+    hid_t lapl_id = lapl.getId();
+
+    ret_value = H5Lcreate_hard(getId(), curr_name, same_loc, new_name, lcpl_id, lapl_id);
+
+   if (ret_value < 0)
+        throwException("link", "creating link failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::link
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a curr_name and \a new_name.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::link(const H5std_string& curr_name, const hid_t same_loc,
+     const H5std_string& new_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    link(curr_name.c_str(), same_loc, new_name.c_str(), lcpl, lapl);
+}
+
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       Copies a link from one location to another.
+///\param       src_name - IN: Original name
+///\param       dst      - IN: Destination location
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::copyLink(const char *src_name, const H5Location& dst,
+     const char *dst_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    herr_t ret_value;
+    hid_t dst_id = dst.getId();
+    hid_t lcpl_id = lcpl.getId();
+    hid_t lapl_id = lapl.getId();
+
+    ret_value = H5Lcopy(getId(), src_name, dst_id, dst_name, lcpl_id, lapl_id);
+    if(ret_value < 0)
+        throwException("copyLink", "H5Lcopy failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::copyLink(const H5std_string& src_name, const H5Location& dst,
+     const H5std_string& dst_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    copyLink(src_name.c_str(), dst, dst_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       Copies a link from a location into the same location.
+///\param       src_name - IN: Original name
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::copyLink(const char *src_name,
+        const char *dst_name, const LinkCreatPropList& lcpl,
+        const LinkAccPropList& lapl) const
+{
+    herr_t ret_value;
+    hid_t lcpl_id = lcpl.getId();
+    hid_t lapl_id = lapl.getId();
+
+    ret_value = H5Lcopy(getId(), src_name, H5L_SAME_LOC, dst_name, lcpl_id, lapl_id);
+    if(ret_value < 0)
+        throwException("copyLink", "H5Lcopy H5L_SAME_LOC failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::copyLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::copyLink(const H5std_string& src_name,
+        const H5std_string& dst_name, const LinkCreatPropList& lcpl,
+        const LinkAccPropList& lapl) const
+{
+    copyLink(src_name.c_str(), dst_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::moveLink
+///\brief       Renames a link in this location and moves it to a new location.
+///\param       src_name - IN: Original name
+///\param       dst      - IN: Destination location
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+///\note
+///             Exercise care in moving groups as it is possible to render
+///             data in a file inaccessible with H5Location::moveLink. Please refer
+///             to the Group Interface in the HDF5 User's Guide for details.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::moveLink(const char* src_name, const H5Location& dst,
+     const char* dst_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    herr_t ret_value;
+    hid_t dst_id = dst.getId();
+    hid_t lcpl_id = lcpl.getId();
+    hid_t lapl_id = lapl.getId();
+
+    ret_value = H5Lmove(getId(), src_name, dst_id, dst_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("moveLink", "H5Lmove failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::moveLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::moveLink(const H5std_string& src_name, const H5Location& dst,
+     const H5std_string& dst_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    moveLink(src_name.c_str(), dst, dst_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::moveLink
+///\brief       Renames a link in this location.
+///\param       src_name - IN: Original name
+///\param       dst_name - IN: New name
+///\param       lcpl     - IN: Link creation plist - default LinkCreatPropList::DEFAULT
+///\param       lapl     - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+///\note
+///             Exercise care in moving groups as it is possible to render
+///             data in a file inaccessible with H5Location::moveLink. Please refer
+///             to the Group Interface in the HDF5 User's Guide for details.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::moveLink(const char* src_name, const char* dst_name,
+     const LinkCreatPropList& lcpl, const LinkAccPropList& lapl) const
+{
+    herr_t ret_value;
+    hid_t lcpl_id = lcpl.getId();
+    hid_t lapl_id = lapl.getId();
+
+    ret_value = H5Lmove(getId(), src_name, H5L_SAME_LOC, dst_name, lcpl_id, lapl_id);
+    if (ret_value < 0)
+        throwException("moveLink", "H5Lmove H5L_SAME_LOC failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::moveLink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a src_name and \a dst_name.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::moveLink(const H5std_string& src_name,
+     const H5std_string& dst_name, const LinkCreatPropList& lcpl,
+     const LinkAccPropList& lapl) const
+{
+    moveLink(src_name.c_str(), dst_name.c_str(), lcpl, lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::unlink
+///\brief       Removes the specified link from this location.
+///\param       name  - IN: Name of the object to be removed
+///\param       lapl - IN: Link access plist - default to LinkAccPropList::DEFAULT
+///\exception   One of the following:
+///                 H5::GroupIException
+///                 H5::FileIException
+///                 H5::DataSetIException
+///                 H5::DataTypeIException
+///                 H5::AttributeIException
+//  May 2018
+// Developer's Note
+//              Originally, CommonFG::unlink was the wrapper of H5Gunlink,
+//              which was replaced by H5Ldelete.  The name "unlink" was kept
+//              to help with backward compatibility.
+//--------------------------------------------------------------------------
+void H5Location::unlink(const char* name, const LinkAccPropList& lapl) const
+{
+    herr_t ret_value = H5Ldelete(getId(), name, lapl.getId());
+    if (ret_value < 0)
+        throwException("unlink", "H5Ldelete failed");
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::unlink
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a name.
+//  May 2018
+//--------------------------------------------------------------------------
+void H5Location::unlink(const H5std_string& name, const LinkAccPropList& lapl) const
+{
+    unlink(name.c_str(), lapl);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getLinkInfo
+///\brief       Returns the information of the named link.
+///\param       link_name  - IN: Symbolic link to the object
+///\param       lapl       - IN: Link access plist - default LinkAccPropList::DEFAULT
+///\return      Name of the object
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// 2000
+//--------------------------------------------------------------------------
+H5L_info_t H5Location::getLinkInfo(const char* link_name, const LinkAccPropList& lapl) const
+{
+    H5L_info_t linkinfo; // link info structure
+
+    herr_t ret_value = H5Lget_info(getId(), link_name, &linkinfo, lapl.getId());
+    if (ret_value < 0)
+        throwException("getLinkInfo", "H5Lget_info to find buffer size failed");
+
+    return(linkinfo);
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getLinkInfo
+///\brief       This is an overloaded member function, provided for convenience.
+///             It differs from the above function in that it takes an
+///             \c H5std_string for \a link_name.
+//--------------------------------------------------------------------------
+H5L_info_t H5Location::getLinkInfo(const H5std_string& link_name, const LinkAccPropList& lapl) const
+{
+    return(getLinkInfo(link_name.c_str(), lapl));
+}
+
+//--------------------------------------------------------------------------
+// Function:    H5Location::getLinkval
+///\brief       Returns the name of the object that the symbolic link points to.
+///\param       name  - IN: Symbolic link to the object
+///\param       size - IN: Maximum number of characters of value to be returned
+///\return      Name of the object
+///\exception   H5::FileIException/H5::GroupIException/H5::LocationException
+// 2000
+//--------------------------------------------------------------------------
+H5std_string H5Location::getLinkval(const char* name, size_t size) const
+{
+    H5L_info_t linkinfo;
+    char *value_C;        // value in C string
+    size_t val_size = size;
+    H5std_string value = "";
+    herr_t ret_value;
+
+    // if user doesn't provide buffer size, determine it
+    if (size == 0)
+    {
+        ret_value = H5Lget_info(getId(), name, &linkinfo, H5P_DEFAULT);
+        if (ret_value < 0)
+            throwException("getLinkval", "H5Lget_info to find buffer size failed");
+
+        val_size = linkinfo.u.val_size;
+    }
+
+    // if link has value, retrieve the value, otherwise, return null string
+    if (val_size > 0)
+    {
+        value_C = new char[val_size+1];  // temporary C-string for C API
+        HDmemset(value_C, 0, val_size+1); // clear buffer
+
+        ret_value = H5Lget_val(getId(), name, value_C, val_size, H5P_DEFAULT);
+        if (ret_value < 0)
+        {
+            delete []value_C;
+            throwException("getLinkval", "H5Lget_val failed");
+        }
+
+        value = H5std_string(value_C);
+        delete []value_C;
+    }
+    return(value);
+}
+
+//--------------------------------------------------------------------------
 // Function:    H5Location destructor
 ///\brief       Noop destructor.
 // Programmer   Binh-Minh Ribler - 2000
@@ -1121,18 +1439,10 @@ H5Location::~H5Location() {}
 
 //--------------------------------------------------------------------------
 // Function:    f_Attribute_setId - friend
-// Purpose:     This function is friend to class H5::Attribute so that it
-//              can set Attribute::id in order to work around a problem
-//              described in the JIRA issue HDFFV-7947.
-//              Applications shouldn't need to use it.
-// param        attr   - IN/OUT: Attribute object to be changed
-// param        new_id - IN: New id to set
-// Programmer   Binh-Minh Ribler - 2015
+// Modification:
+//              Moved to H5Object.cpp after the rearrangement of classes
+//              -BMR, Dec 2016
 //--------------------------------------------------------------------------
-void f_Attribute_setId(Attribute* attr, hid_t new_id)
-{
-    attr->p_setId(new_id);
-}
 
 //--------------------------------------------------------------------------
 // Function:    f_DataSpace_setId - friend