[svn-r14923] Maintenance: This check-in merges changes from the fortran_1_8 branch back into the trunk (up to revision 14921)

Platforms tested: kagiso with g95 and Intel compilers; more testing will be done after checking in a fresh
                  copy from the trunk. New code itself was tested with all Fortran compilers available at THG 

1 files changed, 241 insertions, 144 deletions

diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index a9ac279..77240b2 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -215,213 +215,310 @@ nh5close_types_c( hid_t_f * types, int_f *lentypes,
  *                    Added more FD flags and new H5LIB flags
  *                    Added more FD flags for HDF5 file driver
  *                                  EIP, April 9, 2005
+ *                    Added Generic flags introduced in version 1.8
+ *                                  MSB, January, 2008
+ *                    Added types in lines h5*_flags = ( )variable to match input 
  *---------------------------------------------------------------------------*/
 int_f
 nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags,
                  int_f *h5fd_flags, hid_t_f *h5fd_hid_flags,
-                 int_f *h5g_flags, int_f *h5i_flags,
+                 int_f *h5g_flags, int_f *h5i_flags, int_f *h5l_flags, int_f *h5o_flags,
                  hid_t_f *h5p_flags, int_f *h5r_flags, int_f *h5s_flags,
-                 int_f *h5t_flags, int_f *h5z_flags)
+                 int_f *h5t_flags, int_f *h5z_flags, int_f *h5_generic_flags)
 {
     int ret_value = -1;
 /*
  *  H5D flags
  */
-    h5d_flags[0] = H5D_COMPACT;
-    h5d_flags[1] = H5D_CONTIGUOUS;
-    h5d_flags[2] = H5D_CHUNKED;
-    h5d_flags[3] = H5D_ALLOC_TIME_ERROR;
-    h5d_flags[4] = H5D_ALLOC_TIME_DEFAULT;
-    h5d_flags[5] = H5D_ALLOC_TIME_EARLY;
-    h5d_flags[6] = H5D_ALLOC_TIME_LATE;
-    h5d_flags[7] = H5D_ALLOC_TIME_INCR;
-    h5d_flags[8] = H5D_SPACE_STATUS_ERROR;
-    h5d_flags[9] = H5D_SPACE_STATUS_NOT_ALLOCATED;
-    h5d_flags[10] = H5D_SPACE_STATUS_PART_ALLOCATED;
-    h5d_flags[11] = H5D_SPACE_STATUS_ALLOCATED;
-    h5d_flags[12] = H5D_FILL_TIME_ERROR;
-    h5d_flags[13] = H5D_FILL_TIME_ALLOC;
-    h5d_flags[14] = H5D_FILL_TIME_NEVER;
-    h5d_flags[15] = H5D_FILL_VALUE_ERROR;
-    h5d_flags[16] = H5D_FILL_VALUE_UNDEFINED;
-    h5d_flags[17] = H5D_FILL_VALUE_DEFAULT;
-    h5d_flags[18] = H5D_FILL_VALUE_USER_DEFINED;
+    h5d_flags[0] = (int_f)H5D_COMPACT;
+    h5d_flags[1] = (int_f)H5D_CONTIGUOUS;
+    h5d_flags[2] = (int_f)H5D_CHUNKED;
+    h5d_flags[3] = (int_f)H5D_ALLOC_TIME_ERROR;
+    h5d_flags[4] = (int_f)H5D_ALLOC_TIME_DEFAULT;
+    h5d_flags[5] = (int_f)H5D_ALLOC_TIME_EARLY;
+    h5d_flags[6] = (int_f)H5D_ALLOC_TIME_LATE;
+    h5d_flags[7] = (int_f)H5D_ALLOC_TIME_INCR;
+    h5d_flags[8] = (int_f)H5D_SPACE_STATUS_ERROR;
+    h5d_flags[9] = (int_f)H5D_SPACE_STATUS_NOT_ALLOCATED;
+    h5d_flags[10] = (int_f)H5D_SPACE_STATUS_PART_ALLOCATED;
+    h5d_flags[11] = (int_f)H5D_SPACE_STATUS_ALLOCATED;
+    h5d_flags[12] = (int_f)H5D_FILL_TIME_ERROR;
+    h5d_flags[13] = (int_f)H5D_FILL_TIME_ALLOC;
+    h5d_flags[14] = (int_f)H5D_FILL_TIME_NEVER;
+    h5d_flags[15] = (int_f)H5D_FILL_VALUE_ERROR;
+    h5d_flags[16] = (int_f)H5D_FILL_VALUE_UNDEFINED;
+    h5d_flags[17] = (int_f)H5D_FILL_VALUE_DEFAULT;
+    h5d_flags[18] = (int_f)H5D_FILL_VALUE_USER_DEFINED;
 
 /*
  *  H5F flags
  */
-      h5f_flags[0] = (int_f)H5F_ACC_RDWR;
-      h5f_flags[1] = (int_f)H5F_ACC_RDONLY;
-      h5f_flags[2] = (int_f)H5F_ACC_TRUNC;
-      h5f_flags[3] = (int_f)H5F_ACC_EXCL;
-      h5f_flags[4] = (int_f)H5F_ACC_DEBUG;
-      h5f_flags[5] = (int_f)H5F_SCOPE_LOCAL;
-      h5f_flags[6] = (int_f)H5F_SCOPE_GLOBAL;
-      h5f_flags[7] = (int_f)H5F_CLOSE_DEFAULT;
-      h5f_flags[8] = (int_f)H5F_CLOSE_WEAK;
-      h5f_flags[9] = (int_f)H5F_CLOSE_SEMI;
-      h5f_flags[10] = (int_f)H5F_CLOSE_STRONG;
-      h5f_flags[11] = (int_f)H5F_OBJ_FILE;
-      h5f_flags[12] = (int_f)H5F_OBJ_DATASET;
-      h5f_flags[13] = (int_f)H5F_OBJ_GROUP;
-      h5f_flags[14] = (int_f)H5F_OBJ_DATATYPE;
-      h5f_flags[15] = (int_f)H5F_OBJ_ALL;
-
+    h5f_flags[0] = (int_f)H5F_ACC_RDWR;
+    h5f_flags[1] = (int_f)H5F_ACC_RDONLY;
+    h5f_flags[2] = (int_f)H5F_ACC_TRUNC;
+    h5f_flags[3] = (int_f)H5F_ACC_EXCL;
+    h5f_flags[4] = (int_f)H5F_ACC_DEBUG;
+    h5f_flags[5] = (int_f)H5F_SCOPE_LOCAL;
+    h5f_flags[6] = (int_f)H5F_SCOPE_GLOBAL;
+    h5f_flags[7] = (int_f)H5F_CLOSE_DEFAULT;
+    h5f_flags[8] = (int_f)H5F_CLOSE_WEAK;
+    h5f_flags[9] = (int_f)H5F_CLOSE_SEMI;
+    h5f_flags[10] = (int_f)H5F_CLOSE_STRONG;
+    h5f_flags[11] = (int_f)H5F_OBJ_FILE;
+    h5f_flags[12] = (int_f)H5F_OBJ_DATASET;
+    h5f_flags[13] = (int_f)H5F_OBJ_GROUP;
+    h5f_flags[14] = (int_f)H5F_OBJ_DATATYPE;
+    h5f_flags[15] = (int_f)H5F_OBJ_ALL;
+    h5f_flags[16] = (int_f)H5F_LIBVER_EARLIEST;
+    h5f_flags[17] = (int_f)H5F_LIBVER_LATEST;
+                           
 /*
  *  H5FD flags
  */
-      h5fd_flags[0] = H5FD_MPIO_INDEPENDENT;
-      h5fd_flags[1] = H5FD_MPIO_COLLECTIVE;
-      h5fd_flags[2] = H5FD_MEM_NOLIST;
-      h5fd_flags[3] = H5FD_MEM_DEFAULT;
-      h5fd_flags[4] = H5FD_MEM_SUPER;
-      h5fd_flags[5] = H5FD_MEM_BTREE;
-      h5fd_flags[6] = H5FD_MEM_DRAW;
-      h5fd_flags[7] = H5FD_MEM_GHEAP;
-      h5fd_flags[8] = H5FD_MEM_LHEAP;
-      h5fd_flags[9] = H5FD_MEM_OHDR;
-      h5fd_flags[10] = H5FD_MEM_NTYPES;
+    h5fd_flags[0] = (int_f)H5FD_MPIO_INDEPENDENT;
+    h5fd_flags[1] = (int_f)H5FD_MPIO_COLLECTIVE;
+    h5fd_flags[2] = (int_f)H5FD_MEM_NOLIST;
+    h5fd_flags[3] = (int_f)H5FD_MEM_DEFAULT;
+    h5fd_flags[4] = (int_f)H5FD_MEM_SUPER;
+    h5fd_flags[5] = (int_f)H5FD_MEM_BTREE;
+    h5fd_flags[6] = (int_f)H5FD_MEM_DRAW;
+    h5fd_flags[7] = (int_f)H5FD_MEM_GHEAP;
+    h5fd_flags[8] = (int_f)H5FD_MEM_LHEAP;
+    h5fd_flags[9] = (int_f)H5FD_MEM_OHDR;
+    h5fd_flags[10] = (int_f)H5FD_MEM_NTYPES;
 
 /*
  *  H5FD flags of type hid_t
  */
-      h5fd_hid_flags[0] = H5FD_CORE;
-      h5fd_hid_flags[1] = H5FD_FAMILY;
-      h5fd_hid_flags[2] = H5FD_LOG;
-      h5fd_hid_flags[3] = H5FD_MPIO;
-      h5fd_hid_flags[4] = H5FD_MULTI;
-      h5fd_hid_flags[5] = H5FD_SEC2;
-      h5fd_hid_flags[6] = H5FD_STDIO;
+    h5fd_hid_flags[0] = (int_f)H5FD_CORE;
+    h5fd_hid_flags[1] = (int_f)H5FD_FAMILY;
+    h5fd_hid_flags[2] = (int_f)H5FD_LOG;
+    h5fd_hid_flags[3] = (int_f)H5FD_MPIO;
+    h5fd_hid_flags[4] = (int_f)H5FD_MULTI;
+    h5fd_hid_flags[5] = (int_f)H5FD_SEC2;
+    h5fd_hid_flags[6] = (int_f)H5FD_STDIO;
 
 /*
  *  H5G flags
  */
 
-      h5g_flags[0] = H5O_TYPE_UNKNOWN;
-      h5g_flags[1] = H5O_TYPE_GROUP;
-      h5g_flags[2] = H5O_TYPE_DATASET;
-      h5g_flags[3] = H5O_TYPE_NAMED_DATATYPE;
+    h5g_flags[0] = (int_f)H5O_TYPE_UNKNOWN;
+    h5g_flags[1] = (int_f)H5O_TYPE_GROUP;
+    h5g_flags[2] = (int_f)H5O_TYPE_DATASET;
+    h5g_flags[3] = (int_f)H5O_TYPE_NAMED_DATATYPE;
 /* This value can no longer be returned and all these flags should be updated
  *      to reflect the refinements between links and objects. -QAK */
-/*      h5g_flags[4] = H5G_LINK; */
-      h5g_flags[5] = H5L_TYPE_ERROR;
-      h5g_flags[6] = H5L_TYPE_HARD;
-      h5g_flags[7] = H5L_TYPE_SOFT;
+/*      h5g_flags[4] = H5G_LINK; */    
+    h5g_flags[5] = (int_f)H5L_TYPE_ERROR;
+    h5g_flags[6] = (int_f)H5L_TYPE_HARD;
+    h5g_flags[7] = (int_f)H5L_TYPE_SOFT;
+
+    h5g_flags[8] = (int_f)H5G_STORAGE_TYPE_UNKNOWN;
+    h5g_flags[9] = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE;
+    h5g_flags[10] = (int_f)H5G_STORAGE_TYPE_COMPACT;
+    h5g_flags[11] = (int_f)H5G_STORAGE_TYPE_DENSE;
 
 /*
  *  H5I flags
  */
 
-      h5i_flags[0] = H5I_FILE;
-      h5i_flags[1] = H5I_GROUP;
-      h5i_flags[2] = H5I_DATATYPE;
-      h5i_flags[3] = H5I_DATASPACE;
-      h5i_flags[4] = H5I_DATASET;
-      h5i_flags[5] = H5I_ATTR;
-      h5i_flags[6] = H5I_BADID;
+    h5i_flags[0] = (int_f)H5I_FILE;
+    h5i_flags[1] = (int_f)H5I_GROUP;
+    h5i_flags[2] = (int_f)H5I_DATATYPE;
+    h5i_flags[3] = (int_f)H5I_DATASPACE;
+    h5i_flags[4] = (int_f)H5I_DATASET;
+    h5i_flags[5] = (int_f)H5I_ATTR;
+    h5i_flags[6] = (int_f)H5I_BADID;
+/*
+ *  H5L flags
+ */
+    h5l_flags[0] = (int_f)H5L_TYPE_ERROR;
+    h5l_flags[1] = (int_f)H5L_TYPE_HARD;
+    h5l_flags[2] = (int_f)H5L_TYPE_SOFT;
+    h5l_flags[3] = (int_f)H5L_TYPE_EXTERNAL;
+    h5l_flags[4] = (int_f)H5L_SAME_LOC; /* Macro to indicate operation occurs on same location */
+    h5l_flags[5] = (int_f)H5L_LINK_CLASS_T_VERS; /* Current version of the H5L_class_t struct */
+ 
+/*
+ *  H5O flags
+ */
+
+/* Flags for object copy (H5Ocopy) */
+    h5o_flags[0] = (int_f)H5O_COPY_SHALLOW_HIERARCHY_FLAG; /* Copy only immediate members */
+    h5o_flags[1] = (int_f)H5O_COPY_EXPAND_SOFT_LINK_FLAG; /* Expand soft links into new objects */
+    h5o_flags[2] = (int_f)H5O_COPY_EXPAND_EXT_LINK_FLAG; /* Expand external links into new objects */
+    h5o_flags[3] = (int_f)H5O_COPY_EXPAND_REFERENCE_FLAG; /* Copy objects that are pointed by references */
+    h5o_flags[4] = (int_f)H5O_COPY_WITHOUT_ATTR_FLAG; /* Copy object without copying attributes */
+    h5o_flags[5] = (int_f)H5O_COPY_PRESERVE_NULL_FLAG; /* Copy NULL messages (empty space) */
+    h5o_flags[6] = (int_f)H5O_COPY_ALL; /* All object copying flags (for internal checking) */
+
+/* Flags for shared message indexes.
+ * Pass these flags in using the mesg_type_flags parameter in
+ * H5P_set_shared_mesg_index.
+ * (Developers: These flags correspond to object header message type IDs,
+ * but we need to assign each kind of message to a different bit so that
+ * one index can hold multiple types.)
+ */
+      h5o_flags[7] = (int_f)H5O_SHMESG_NONE_FLAG;  /* No shared messages */
+      h5o_flags[8] = (int_f)H5O_SHMESG_SDSPACE_FLAG; /* Simple Dataspace Message.  */
+      h5o_flags[9] = (int_f)H5O_SHMESG_DTYPE_FLAG; /* Datatype Message.  */
+      h5o_flags[10] = (int_f)H5O_SHMESG_FILL_FLAG; /* Fill Value Message. */
+      h5o_flags[11] = (int_f)H5O_SHMESG_PLINE_FLAG; /* Filter pipeline message.  */
+      h5o_flags[12] = (int_f)H5O_SHMESG_ATTR_FLAG; /* Attribute Message.  */
+      h5o_flags[13] = (int_f)H5O_SHMESG_ALL_FLAG;
+
+/* Object header status flag definitions */
+      h5o_flags[14] = (int_f)H5O_HDR_CHUNK0_SIZE; /* 2-bit field indicating # of bytes to store the size of chunk 0's data */
+      h5o_flags[15] = (int_f)H5O_HDR_ATTR_CRT_ORDER_TRACKED; /* Attribute creation order is tracked */
+      h5o_flags[16] = (int_f)H5O_HDR_ATTR_CRT_ORDER_INDEXED; /* Attribute creation order has index */
+      h5o_flags[17] = (int_f)H5O_HDR_ATTR_STORE_PHASE_CHANGE; /* Non-default attribute storage phase change values stored */
+      h5o_flags[18] = (int_f)H5O_HDR_STORE_TIMES; /* Store access, modification, change & birth times for object */
+      h5o_flags[19] = (int_f)H5O_HDR_ALL_FLAGS; 
+
+/* Maximum shared message values.  Number of indexes is 8 to allow room to add
+ * new types of messages.
+ */
+      h5o_flags[20] = (int_f)H5O_SHMESG_MAX_NINDEXES;
+      h5o_flags[21] = (int_f)H5O_SHMESG_MAX_LIST_SIZE;
 
 /*
  *  H5P flags
  */
 
-      h5p_flags[0] = H5P_FILE_CREATE;
-      h5p_flags[1] = H5P_FILE_ACCESS;
-      h5p_flags[2] = H5P_DATASET_CREATE;
-      h5p_flags[3] = H5P_DATASET_XFER;
-      h5p_flags[4] = H5P_FILE_MOUNT;
-      h5p_flags[5] = H5P_DEFAULT;
-      h5p_flags[6] = H5P_ROOT;
-
+      h5p_flags[0] = (hid_t_f)H5P_FILE_CREATE;
+      h5p_flags[1] = (hid_t_f)H5P_FILE_ACCESS;
+      h5p_flags[2] = (hid_t_f)H5P_DATASET_CREATE;
+      h5p_flags[3] = (hid_t_f)H5P_DATASET_XFER;
+      h5p_flags[4] = (hid_t_f)H5P_FILE_MOUNT;
+      h5p_flags[5] = (hid_t_f)H5P_DEFAULT;
+      h5p_flags[6] = (hid_t_f)H5P_ROOT;
+      h5p_flags[7] = (hid_t_f)H5P_CRT_ORDER_INDEXED;
+      h5p_flags[8] = (hid_t_f)H5P_CRT_ORDER_TRACKED;
+      h5p_flags[9] = (hid_t_f)H5P_OBJECT_CREATE;
+      h5p_flags[10] = (hid_t_f)H5P_DATASET_ACCESS;
+      h5p_flags[11] = (hid_t_f)H5P_GROUP_CREATE;
+      h5p_flags[12] = (hid_t_f)H5P_GROUP_ACCESS;
+      h5p_flags[13] = (hid_t_f)H5P_DATATYPE_CREATE;
+      h5p_flags[14] = (hid_t_f)H5P_DATATYPE_ACCESS;
+      h5p_flags[15] = (hid_t_f)H5P_STRING_CREATE;
+      h5p_flags[16] = (hid_t_f)H5P_ATTRIBUTE_CREATE;
+      h5p_flags[17] = (hid_t_f)H5P_OBJECT_COPY;
+      h5p_flags[18] = (hid_t_f)H5P_LINK_CREATE;
+      h5p_flags[19] = (hid_t_f)H5P_LINK_ACCESS;
 /*
  *  H5R flags
  */
 
-      h5r_flags[0] = H5R_OBJECT;
-      h5r_flags[1] = H5R_DATASET_REGION;
+      h5r_flags[0] = (int_f)H5R_OBJECT;
+      h5r_flags[1] = (int_f)H5R_DATASET_REGION;
 
 /*
  *  H5S flags
  */
 
 
-      h5s_flags[0] = H5S_SCALAR;
-      h5s_flags[1] = H5S_SIMPLE;
-      h5s_flags[2] = H5S_NULL;
-      h5s_flags[3] = H5S_SELECT_SET;
-      h5s_flags[4] = H5S_SELECT_OR;
+      h5s_flags[0] = (int_f)H5S_SCALAR;
+      h5s_flags[1] = (int_f)H5S_SIMPLE;
+      h5s_flags[2] = (int_f)H5S_NULL;
+      h5s_flags[3] = (int_f)H5S_SELECT_SET;
+      h5s_flags[4] = (int_f)H5S_SELECT_OR;
       h5s_flags[5] = (int_f)H5S_UNLIMITED;
       h5s_flags[6] = (int_f)H5S_ALL;
 
-      h5s_flags[7] = H5S_SELECT_NOOP;
-      h5s_flags[8] = H5S_SELECT_AND;
-      h5s_flags[9] = H5S_SELECT_XOR;
-      h5s_flags[10] = H5S_SELECT_NOTB;
-      h5s_flags[11] = H5S_SELECT_NOTA;
-      h5s_flags[12] = H5S_SELECT_APPEND;
-      h5s_flags[13] = H5S_SELECT_PREPEND;
-      h5s_flags[14] = H5S_SELECT_INVALID;
+      h5s_flags[7] = (int_f)H5S_SELECT_NOOP;
+      h5s_flags[8] = (int_f)H5S_SELECT_AND;
+      h5s_flags[9] = (int_f)H5S_SELECT_XOR;
+      h5s_flags[10] = (int_f)H5S_SELECT_NOTB;
+      h5s_flags[11] = (int_f)H5S_SELECT_NOTA;
+      h5s_flags[12] = (int_f)H5S_SELECT_APPEND;
+      h5s_flags[13] = (int_f)H5S_SELECT_PREPEND;
+      h5s_flags[14] = (int_f)H5S_SELECT_INVALID;
 
 
-      h5s_flags[15] = H5S_SEL_ERROR;
-      h5s_flags[16] = H5S_SEL_NONE;
-      h5s_flags[17] = H5S_SEL_POINTS;
-      h5s_flags[18] = H5S_SEL_HYPERSLABS;
-      h5s_flags[19] = H5S_SEL_ALL;
+      h5s_flags[15] = (int_f)H5S_SEL_ERROR;
+      h5s_flags[16] = (int_f)H5S_SEL_NONE;
+      h5s_flags[17] = (int_f)H5S_SEL_POINTS;
+      h5s_flags[18] = (int_f)H5S_SEL_HYPERSLABS;
+      h5s_flags[19] = (int_f)H5S_SEL_ALL;
 
 /*
  *  H5T flags
  */
 
 
-      h5t_flags[0] = H5T_NO_CLASS;
-      h5t_flags[1] = H5T_INTEGER;
-      h5t_flags[2] = H5T_FLOAT;
-      h5t_flags[3] = H5T_TIME;
-      h5t_flags[4] = H5T_STRING;
-      h5t_flags[5] = H5T_BITFIELD;
-      h5t_flags[6] = H5T_OPAQUE;
-      h5t_flags[7] = H5T_COMPOUND;
-      h5t_flags[8] = H5T_REFERENCE;
-      h5t_flags[9] = H5T_ENUM;
-      h5t_flags[10] = H5T_ORDER_LE;
-      h5t_flags[11] = H5T_ORDER_BE;
-      h5t_flags[12] = H5T_ORDER_VAX;
-      h5t_flags[13] = H5T_PAD_ZERO;
-      h5t_flags[14] = H5T_PAD_ONE;
-      h5t_flags[15] = H5T_PAD_BACKGROUND;
-      h5t_flags[16] = H5T_PAD_ERROR;
-      h5t_flags[17] = H5T_SGN_NONE;
-      h5t_flags[18] = H5T_SGN_2;
-      h5t_flags[19] = H5T_SGN_ERROR;
-      h5t_flags[20] = H5T_NORM_IMPLIED;
-      h5t_flags[21] = H5T_NORM_MSBSET;
-      h5t_flags[22] = H5T_NORM_NONE;
-      h5t_flags[23] = H5T_CSET_ASCII;
-      h5t_flags[24] = H5T_CSET_UTF8;
-      h5t_flags[25] = H5T_STR_NULLTERM;
-      h5t_flags[26] = H5T_STR_NULLPAD;
-      h5t_flags[27] = H5T_STR_SPACEPAD;
-      h5t_flags[28] = H5T_STR_ERROR;
-      h5t_flags[29] = H5T_VLEN;
-      h5t_flags[30] = H5T_ARRAY;
+      h5t_flags[0] = (int_f)H5T_NO_CLASS;
+      h5t_flags[1] = (int_f)H5T_INTEGER;
+      h5t_flags[2] = (int_f)H5T_FLOAT;
+      h5t_flags[3] = (int_f)H5T_TIME;
+      h5t_flags[4] = (int_f)H5T_STRING;
+      h5t_flags[5] = (int_f)H5T_BITFIELD;
+      h5t_flags[6] = (int_f)H5T_OPAQUE;
+      h5t_flags[7] = (int_f)H5T_COMPOUND;
+      h5t_flags[8] = (int_f)H5T_REFERENCE;
+      h5t_flags[9] = (int_f)H5T_ENUM;
+      h5t_flags[10] = (int_f)H5T_ORDER_LE;
+      h5t_flags[11] = (int_f)H5T_ORDER_BE;
+      h5t_flags[12] = (int_f)H5T_ORDER_VAX;
+      h5t_flags[13] = (int_f)H5T_PAD_ZERO;
+      h5t_flags[14] = (int_f)H5T_PAD_ONE;
+      h5t_flags[15] = (int_f)H5T_PAD_BACKGROUND;
+      h5t_flags[16] = (int_f)H5T_PAD_ERROR;
+      h5t_flags[17] = (int_f)H5T_SGN_NONE;
+      h5t_flags[18] = (int_f)H5T_SGN_2;
+      h5t_flags[19] = (int_f)H5T_SGN_ERROR;
+      h5t_flags[20] = (int_f)H5T_NORM_IMPLIED;
+      h5t_flags[21] = (int_f)H5T_NORM_MSBSET;
+      h5t_flags[22] = (int_f)H5T_NORM_NONE;
+      h5t_flags[23] = (int_f)H5T_CSET_ASCII;
+      h5t_flags[24] = (int_f)H5T_CSET_UTF8;
+      h5t_flags[25] = (int_f)H5T_STR_NULLTERM;
+      h5t_flags[26] = (int_f)H5T_STR_NULLPAD;
+      h5t_flags[27] = (int_f)H5T_STR_SPACEPAD;
+      h5t_flags[28] = (int_f)H5T_STR_ERROR;
+      h5t_flags[29] = (int_f)H5T_VLEN;
+      h5t_flags[30] = (int_f)H5T_ARRAY;
 /*
  *  H5Z flags
  */
 
-      h5z_flags[0] = H5Z_FILTER_ERROR;
-      h5z_flags[1] = H5Z_FILTER_NONE;
-      h5z_flags[2] = H5Z_FILTER_DEFLATE;
-      h5z_flags[3] = H5Z_FILTER_SHUFFLE;
-      h5z_flags[4] = H5Z_FILTER_FLETCHER32;
-      h5z_flags[5] = H5Z_ERROR_EDC;
-      h5z_flags[6] = H5Z_DISABLE_EDC;
-      h5z_flags[7] = H5Z_ENABLE_EDC;
-      h5z_flags[8] = H5Z_NO_EDC;
-      h5z_flags[9] = H5Z_FILTER_SZIP;
-      h5z_flags[10] = H5Z_FLAG_OPTIONAL;
-      h5z_flags[11] = H5Z_FILTER_CONFIG_ENCODE_ENABLED;
-      h5z_flags[12] = H5Z_FILTER_CONFIG_DECODE_ENABLED;
-      h5z_flags[13] = H5Z_FILTER_ALL;
+      h5z_flags[0] = (int_f)H5Z_FILTER_ERROR;
+      h5z_flags[1] = (int_f)H5Z_FILTER_NONE;
+      h5z_flags[2] = (int_f)H5Z_FILTER_DEFLATE;
+      h5z_flags[3] = (int_f)H5Z_FILTER_SHUFFLE;
+      h5z_flags[4] = (int_f)H5Z_FILTER_FLETCHER32;
+      h5z_flags[5] = (int_f)H5Z_ERROR_EDC;
+      h5z_flags[6] = (int_f)H5Z_DISABLE_EDC;
+      h5z_flags[7] = (int_f)H5Z_ENABLE_EDC;
+      h5z_flags[8] = (int_f)H5Z_NO_EDC;
+      h5z_flags[9] = (int_f)H5Z_FILTER_SZIP;
+      h5z_flags[10] = (int_f)H5Z_FLAG_OPTIONAL;
+      h5z_flags[11] = (int_f)H5Z_FILTER_CONFIG_ENCODE_ENABLED;
+      h5z_flags[12] = (int_f)H5Z_FILTER_CONFIG_DECODE_ENABLED;
+      h5z_flags[13] = (int_f)H5Z_FILTER_ALL;
+/*
+ *  H5A flags
+ */
+
+
+/*
+ *  H5 Generic flags introduced in version 1.8 -MSB-
+ */
+
+      /* H5_index_t enum struct */
+
+      h5_generic_flags[0] = (int_f)H5_INDEX_UNKNOWN;   /* Unknown index type			*/
+      h5_generic_flags[1] = (int_f)H5_INDEX_NAME;      /* Index on names 			*/
+      h5_generic_flags[2] = (int_f)H5_INDEX_CRT_ORDER; /* Index on creation order 		*/
+      h5_generic_flags[3] = (int_f)H5_INDEX_N;         /* Index on creation order 		*/
+      
+      
+      /* H5_iter_order_t enum struct */
+
+      h5_generic_flags[4] = (int_f)H5_ITER_UNKNOWN;       /* Unknown order */
+      h5_generic_flags[5] = (int_f)H5_ITER_INC;           /* Increasing order */
+      h5_generic_flags[6] = (int_f)H5_ITER_DEC;           /* Decreasing order */
+      h5_generic_flags[7] = (int_f)H5_ITER_NATIVE;        /* No particular order, whatever is fastest */
+      h5_generic_flags[8] = (int_f)H5_ITER_N;		   /* Number of iteration orders */
 
     ret_value = 0;
     return ret_value;