Merge pull request #1111 in HDFFV/hdf5 from hdf5_1_10.sync to hdf5_1_10

* commit '57f64b92d19fed2879ee9bafe1d29bfac865d54c': (30 commits)
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  HDFFV-10405: Using h5fget_obj_count_f with a file id of H5F_OBJ_ALL_F does not work properly
  Cleaned up H5Fmount/unmount code.
  Normalization with vol_integration branch.
  Add fortran MPI to test and example
  Add mpi include folders for fortran C objects
  Normalization with the vol_integration branch.
  Fixed MANIFEST
  Fix usage of compression lib in shared tests
  Fix jni function call version
  Fix the error found after earlier checkin.
  H5O_info fixes for java and examples
  Added a RELASE.txt entry for HDFFV-10505.
  Changed 'deprecated' to indicate 'no longer supported' in the --enable-debug/production configure flags.
  (1) Made the change according to the pull request feedback. (2) Removed the performance test form test/th5o.c: will decide on what needs to be done to show speedup via HDFFV-10463.
  Normalize with vol_integration.
  Removed unused H5MF functions and updated FUNC_ENTER macros and naming in H5MFsection.c.
  Restored some unused #defines to the deprecated section of H5Dpublic.h.
  Changes made based on feedback from pull request #1039.
  ...

2 files changed, 5 insertions, 5 deletions

diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp
index 2dceb6e..8df7467 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -1827,7 +1827,7 @@ H5O_type_t H5Location::childObjType(const char* objname) const
     H5O_type_t objtype = H5O_TYPE_UNKNOWN;
 
     // Use C API to get information of the object
-    herr_t ret_value = H5Oget_info_by_name(getId(), objname, &objinfo, H5P_DEFAULT);
+    herr_t ret_value = H5Oget_info_by_name2(getId(), objname, &objinfo, H5O_INFO_BASIC, H5P_DEFAULT);
 
     // Throw exception if C API returns failure
     if (ret_value < 0)
@@ -1902,7 +1902,7 @@ H5O_type_t H5Location::childObjType(hsize_t index, H5_index_t index_type, H5_ite
     H5O_type_t objtype = H5O_TYPE_UNKNOWN;
 
     // Use C API to get information of the object
-    ret_value = H5Oget_info_by_idx(getId(), objname, index_type, order, index, &objinfo, H5P_DEFAULT);
+    ret_value = H5Oget_info_by_idx2(getId(), objname, index_type, order, index, &objinfo, H5O_INFO_BASIC, H5P_DEFAULT);
 
     // Throw exception if C API returns failure
     if (ret_value < 0)
@@ -1944,7 +1944,7 @@ unsigned H5Location::childObjVersion(const char* objname) const
     unsigned version = 0;
 
     // Use C API to get information of the object
-    herr_t ret_value = H5Oget_info_by_name(getId(), objname, &objinfo, H5P_DEFAULT);
+    herr_t ret_value = H5Oget_info_by_name2(getId(), objname, &objinfo, H5O_INFO_HDR, H5P_DEFAULT);
 
     // Throw exception if C API returns failure
     if (ret_value < 0)
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 5d102d7..b95e222 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -244,7 +244,7 @@ unsigned H5Object::objVersion() const
     unsigned version = 0;
 
     // Use C API to get information of the object
-    herr_t ret_value = H5Oget_info(getId(), &objinfo);
+    herr_t ret_value = H5Oget_info2(getId(), &objinfo, H5O_INFO_HDR);
 
     // Throw exception if C API returns failure
     if (ret_value < 0)
@@ -270,7 +270,7 @@ int H5Object::getNumAttrs() const
 {
     H5O_info_t oinfo;    /* Object info */
 
-    if(H5Oget_info(getId(), &oinfo) < 0)
+    if(H5Oget_info2(getId(), &oinfo, H5O_INFO_NUM_ATTRS) < 0)
         throw AttributeIException(inMemFunc("getNumAttrs"), "H5Oget_info failed");
     else
         return(static_cast<int>(oinfo.num_attrs));