Most changes for fixing post open issues

1 files changed, 11 insertions, 9 deletions

diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 51ecaca..877aa21 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -199,6 +199,15 @@ typedef struct H5T_ref_class_t {
     H5T_ref_writefunc_t   write;   /* write reference from buffer  */
 } H5T_ref_class_t;
 
+typedef struct H5T_atomic_ref_t {
+    H5R_type_t             rtype;   /* type of reference stored             */
+    unsigned               version; /* version of encoded reference         */
+    hbool_t                opaque;  /* opaque reference type                */
+    H5T_loc_t              loc;     /* location of data in buffer           */
+    H5VL_object_t *file_obj; /* File VOL object (if data is on disk) */
+    const H5T_ref_class_t *cls;     /* Pointer to ref class callbacks */
+} H5T_atomic_ref_t;
+
 typedef struct H5T_atomic_t {
     H5T_order_t order;   /* byte order                           */
     size_t      prec;    /* precision in bits                    */
@@ -226,14 +235,7 @@ typedef struct H5T_atomic_t {
             H5T_str_t  pad;  /* space or null padding of extra bytes */
         } s;                 /* string types */
 
-        struct {
-            H5R_type_t             rtype;   /* type of reference stored             */
-            unsigned               version; /* version of encoded reference         */
-            hbool_t                opaque;  /* opaque reference type                */
-            H5T_loc_t              loc;     /* location of data in buffer           */
-            H5VL_object_t *        file;    /* file VOL pointer (if data is on disk) */
-            const H5T_ref_class_t *cls;     /* Pointer to ref class callbacks */
-        } r;                                /* reference types */
+        H5T_atomic_ref_t r;     /* Reference type info */
     } u;
 } H5T_atomic_t;
 
@@ -307,7 +309,7 @@ typedef struct H5T_vlen_t {
     H5T_cset_t      cset;         /* For VL string: character set */
     H5T_str_t       pad;          /* For VL string: space or null padding of
                                    * extra bytes */
-    H5VL_object_t *         file; /* File object (if VL data is on disk) */
+    H5VL_object_t *file_obj; /* File VOL object (if VL data is on disk) */
     const H5T_vlen_class_t *cls;  /* Pointer to VL class callbacks */
 } H5T_vlen_t;