Merge branch 'develop' of https://git.hdfgroup.org/scm/~kmu/hdf5 into develop

1 files changed, 7 insertions, 7 deletions

diff --git a/java/examples/groups/H5Ex_G_Intermediate.java b/java/examples/groups/H5Ex_G_Intermediate.java
index f7d5a50..e97e5f8 100644
--- a/java/examples/groups/H5Ex_G_Intermediate.java
+++ b/java/examples/groups/H5Ex_G_Intermediate.java
@@ -19,8 +19,8 @@ package examples.groups;
 
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
-import hdf.hdf5lib.callbacks.H5O_iterate_cb;
 import hdf.hdf5lib.callbacks.H5O_iterate_t;
+import hdf.hdf5lib.callbacks.H5O_iterate_opdata_t;
 import hdf.hdf5lib.structs.H5O_info_t;
 
 import java.util.ArrayList;
@@ -53,9 +53,9 @@ public class H5Ex_G_Intermediate {
             // Print all the objects in the file_ids to show that intermediate group_ids have been created.
             System.out.println("Objects in the file_id:");
 
-            // H5O_iterate_t iter_data = null;
-            H5O_iterate_t iter_data = new H5O_iter_data();
-            H5O_iterate_cb iter_cb = new H5O_iter_callback();
+            // H5O_iterate_opdata_t iter_data = null;
+            H5O_iterate_opdata_t iter_data = new H5O_iter_data();
+            H5O_iterate_t iter_cb = new H5O_iter_callback();
 
             H5.H5Ovisit(file_id, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_NATIVE, iter_cb, iter_data);
         }
@@ -92,12 +92,12 @@ public class H5Ex_G_Intermediate {
         }
     }
 
-    private class H5O_iter_data implements H5O_iterate_t {
+    private class H5O_iter_data implements H5O_iterate_opdata_t {
         public ArrayList<idata> iterdata = new ArrayList<idata>();
     }
 
-    private class H5O_iter_callback implements H5O_iterate_cb {
-        public int callback(long group, String name, H5O_info_t info, H5O_iterate_t op_data) {
+    private class H5O_iter_callback implements H5O_iterate_t {
+        public int callback(long group, String name, H5O_info_t info, H5O_iterate_opdata_t op_data) {
             idata id = new idata(name, info.type);
             ((H5O_iter_data) op_data).iterdata.add(id);