Merge pull request #811 in HDFFV/hdf5 from hdf5_1_8_20 to 1.8/masterhdf5-1_8_20

* commit '60f76980aab92f0e0730170b99a2363acd3c97fa': (108 commits)
  Update version numbers and remove empty sections in RELEASE.txt.
  Restore line 1154: C2Cppfunction_map.mht to HTML_EXTRA_FILES.
  Update version for 1.8.20 release.
  Fixed documentation warnings
  HDFFV-10329 Correct LINK INTERFACE and VS20013 compile
  Switch default build mode from development to production. Increment version string to pre2.
  Add RELEASE.txt note for HDFFV-10274. (cherry picked from commit f7a7d0a00613cba997212fa8032091629a678797)
  Initialize hid_t variables in test_Attr_bug9. (cherry picked from commit 97bc393449f3fe02c5992872ab2842e12f611ef0)
  Fix HDFFV-10274.  When deleting all (or almost all) of the messages in an object header chunk, where the total amount deleted was greater than 64K, an error would occur due to an off by one error in the code that handled that case.  Fixed this and added a test case. (cherry picked from commit 1b2c2ca9a6a7d7e1fcd5c3302e203f2e2dabf0af)
  Fix linking of libs
  Changed file path to relative.
  iAdd NAG to supported compilers in RELEASE.txt.
  Add description to RELEASE.txt for HDFFV-10323
  Correct issue number
  Set version to 1.8.20-pre1
  Update supported and tested platforms in RELEASE.txt.
  HDFFV-10321 Merge from 1.8
  Incremented lib file .so numbers: revision for all except c++ for code change; current incremented, revision and age set to 0 for c++ due to symbols added and removed.
  updated issues related to Fortran
  Incremented lib file .so numbers: revision for all except c++ for dcode change; current incremented, revision and age set to 0 for c++ due to symbols added and removed.
  ...

1 files changed, 56 insertions, 30 deletions

diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index bbeb30f..12c3e8a 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -41,20 +41,6 @@ class UserData4Aiterate { // user data for attribute iteration
 //  Inheritance: IdComponent
 class H5_DLLCPP H5Location : public IdComponent {
    public:
-        // Creates an attribute for the specified object at this location
-        // PropList is currently not used, so always be default.
-        virtual Attribute createAttribute(const char* name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT) const;
-        virtual Attribute createAttribute(const H5std_string& name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT) const;
-
-        // Given its name, opens the attribute that belongs to an object at
-        // this location.
-        virtual Attribute openAttribute(const char* name) const;
-        virtual Attribute openAttribute(const H5std_string& name) const;
-
-        // Given its index, opens the attribute that belongs to an object at
-        // this location.
-        virtual Attribute openAttribute(const unsigned int idx) const;
-
         // Checks if a link of a given name exists in this location
         bool nameExists(const char* name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
         bool nameExists(const H5std_string& name, const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
@@ -65,8 +51,18 @@ class H5_DLLCPP H5Location : public IdComponent {
         // Gets the name of the file, specified by this location.
         H5std_string getFileName() const;
 
+        // Retrieves information about an object at this location
+            // specified by location
+        void getObjectInfo(H5O_info_t *oinfo) const;
+            // specified by the object's name
+        void getObjectInfo(const char *name, H5O_info_t *oinfo,
+                const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
+        void getObjectInfo(const H5std_string& name, H5O_info_t *oinfo,
+                const LinkAccPropList& lapl = LinkAccPropList::DEFAULT) const;
+
         // Determines the number of attributes at this location.
-        int getNumAttrs() const;
+        // - moved to H5Object (1.8.20)
+        int getNumAttrs() const;    // Deprecated
 
 #ifndef H5_NO_DEPRECATED_SYMBOLS
         // Retrieves the type of object that an object reference points to.
@@ -78,21 +74,6 @@ class H5_DLLCPP H5Location : public IdComponent {
         // Note: getRefObjType deprecates getObjType, but getObjType's name is
         // misleading, so getRefObjType is used in the new function instead.
 
-        // Iterate user's function over the attributes at this location.
-        virtual int iterateAttrs(attr_operator_t user_op, unsigned* idx = NULL, void* op_data = NULL);
-
-        // Checks whether the named attribute exists at this location.
-        virtual bool attrExists(const char* name) const;
-        virtual bool attrExists(const H5std_string& name) const;
-
-        // Renames the named attribute to a new name.
-        virtual void renameAttr(const char* oldname, const char* newname) const;
-        virtual void renameAttr(const H5std_string& oldname, const H5std_string& newname) const;
-
-        // Removes the named attribute from this location.
-        virtual void removeAttr(const char* name) const;
-        virtual void removeAttr(const H5std_string& name) const;
-
         // Returns the object header version of an object
         unsigned objVersion() const;
 
@@ -140,6 +121,51 @@ class H5_DLLCPP H5Location : public IdComponent {
         ///\brief Returns an identifier. (pure virtual)
         virtual hid_t getId() const = 0;
 
+/***************************************************************************
+                           Notes for H5A wrappers
+                           ======================
+        These H5A wrappers are marked "deprecated" in 1.8.19.
+        They are moved to H5Object to prevent the object id from being
+        passed in to H5A APIs.
+***************************************************************************/
+
+        // Creates an attribute for the specified object at this location
+        // PropList is currently not used, so always be default.
+        // Deprecated
+        virtual Attribute createAttribute(const char* name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT) const;
+        virtual Attribute createAttribute(const H5std_string& name, const DataType& type, const DataSpace& space, const PropList& create_plist = PropList::DEFAULT) const;
+
+        // Given its name, opens the attribute that belongs to an object at
+        // this location.
+        // Deprecated
+        virtual Attribute openAttribute(const char* name) const;
+        virtual Attribute openAttribute(const H5std_string& name) const;
+
+        // Given its index, opens the attribute that belongs to an object at
+        // this location.
+        virtual Attribute openAttribute(const unsigned int idx) const; // Deprecated
+
+        // Iterate user's function over the attributes at this location.
+        virtual int iterateAttrs(attr_operator_t user_op, unsigned* idx = NULL,
+                                 void* op_data = NULL); // Deprecated
+
+        // Checks whether the named attribute exists at this location.
+        // Deprecated
+        virtual bool attrExists(const char* name) const;
+        virtual bool attrExists(const H5std_string& name) const;
+
+        // Renames the named attribute to a new name.
+        // Deprecated
+        virtual void renameAttr(const char* oldname, const char* newname) const;
+        virtual void renameAttr(const H5std_string& oldname, const H5std_string& newname) const;
+
+        // Removes the named attribute from this location.
+        // Deprecated
+        virtual void removeAttr(const char* name) const;
+        virtual void removeAttr(const H5std_string& name) const;
+
+/**************************** End of H5A note *******************************/
+
    protected:
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
         // Default constructor,