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.
  ...

1 files changed, 8 insertions, 8 deletions

diff --git a/java/test/TestH5Oparams.java b/java/test/TestH5Oparams.java
index 2af190f..8b3c673 100644
--- a/java/test/TestH5Oparams.java
+++ b/java/test/TestH5Oparams.java
@@ -71,27 +71,27 @@ public class TestH5Oparams {
 
     @Test(expected = HDF5LibraryException.class)
     public void testH5Oget_info_invalid() throws Throwable {
-        H5.H5Oget_info(-1);
+        H5.H5Oget_info(-1, 0);
     }
 
     @Test(expected = NullPointerException.class)
     public void testH5Oget_info_by_name_null() throws Throwable {
-        H5.H5Oget_info_by_name(-1, null, HDF5Constants.H5P_DEFAULT);
+        H5.H5Oget_info_by_name(-1, null, 0, HDF5Constants.H5P_DEFAULT);
     }
 
     @Test(expected = HDF5LibraryException.class)
     public void testH5Oget_info_by_name_invalid() throws Throwable {
-        H5.H5Oget_info_by_name(-1, "/testH5Gcreate", HDF5Constants.H5P_DEFAULT);
+        H5.H5Oget_info_by_name(-1, "/testH5Gcreate", 0, HDF5Constants.H5P_DEFAULT);
     }
 
     @Test(expected = HDF5LibraryException.class)
     public void testH5Oget_info_by_idx_invalid() throws Throwable {
-        H5.H5Oget_info_by_idx(-1, "Bogus", -1, -1, -1L, -1);
+        H5.H5Oget_info_by_idx(-1, "Bogus", -1, -1, -1L, 0, -1);
     }
 
     @Test(expected = NullPointerException.class)
     public void testH5Oget_info_by_idx_null() throws Throwable {
-        H5.H5Oget_info_by_idx(-1, null, 0, 0, 0L, 0);
+        H5.H5Oget_info_by_idx(-1, null, 0, 0, 0L, 0, 0);
     }
 
     @Test(expected = HDF5LibraryException.class)
@@ -106,17 +106,17 @@ public class TestH5Oparams {
 
     @Test(expected = NullPointerException.class)
     public void testH5Ovisit_null() throws Throwable {
-        H5.H5Ovisit(-1, -1, -1, null, null);
+        H5.H5Ovisit(-1, -1, -1, null, null, 0);
     }
 
     @Test(expected = NullPointerException.class)
     public void testH5Ovisit_by_name_nullname() throws Throwable {
-        H5.H5Ovisit_by_name(-1, null, -1, -1, null, null, -1);
+        H5.H5Ovisit_by_name(-1, null, -1, -1, null, null, 0, -1);
     }
 
     @Test(expected = NullPointerException.class)
     public void testH5Ovisit_by_name_null() throws Throwable {
-        H5.H5Ovisit_by_name(-1, "Bogus", -1, -1, null, null, -1);
+        H5.H5Ovisit_by_name(-1, "Bogus", -1, -1, null, null, 0, -1);
     }
 
     @Test(expected = HDF5LibraryException.class)