[svn-r25496] Description:

    Merge 64-bit ID changes from branch to trunk.  (Plus a few minor cleanups
that aren't on the branch)

Tested on:
    Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN
    (h5committested on branch already for a week)

11 files changed, 392 insertions, 383 deletions

diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c
index 06ce078..15d2f21 100644
--- a/hl/src/H5DS.c
+++ b/hl/src/H5DS.c
@@ -22,6 +22,9 @@
 #include "H5TBprivate.h"
 
 
+/* Local routines */
+static herr_t H5DS_is_reserved(hid_t did);
+static hid_t H5DS_get_REFLIST_type(void);
 
 /*-------------------------------------------------------------------------
 * Function: H5DSset_scale
@@ -221,11 +224,11 @@ herr_t H5DSattach_scale(hid_t did,
     *-------------------------------------------------------------------------
     */
     /* create a reference for the >>DS<< dataset */
-    if (H5Rcreate(&ref_to_ds,dsid,".",H5R_OBJECT,-1) < 0)
+    if (H5Rcreate(&ref_to_ds, dsid, ".", H5R_OBJECT, (hid_t)-1) < 0)
         return FAIL;
 
     /* create a reference for the >>data<< dataset */
-    if (H5Rcreate(&dsl.ref,did,".",H5R_OBJECT,-1) < 0)
+    if (H5Rcreate(&dsl.ref, did, ".", H5R_OBJECT, (hid_t)-1) < 0)
         return FAIL;
 
     /* try to find the attribute "DIMENSION_LIST" on the >>data<< dataset */
@@ -2109,6 +2112,7 @@ out:
 *-------------------------------------------------------------------------
 */
 
+static
 herr_t H5DS_is_reserved(hid_t did)
 {
     int    has_class;
@@ -2179,6 +2183,7 @@ out:
 *-------------------------------------------------------------------------
 */
 
+static
 hid_t H5DS_get_REFLIST_type(void)
 {
     hid_t ntid_t = -1; 
diff --git a/hl/src/H5DSprivate.h b/hl/src/H5DSprivate.h
index 5094208..61c0a1c 100644
--- a/hl/src/H5DSprivate.h
+++ b/hl/src/H5DSprivate.h
@@ -37,8 +37,6 @@ typedef struct ds_list_t {
  *-------------------------------------------------------------------------
  */
 
-H5_HLDLL herr_t  H5DS_is_reserved( hid_t did);
-H5_HLDLL hid_t H5DS_get_REFLIST_type(void);
 
 #endif
 
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 9c7c7e8..9239e4e 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -554,7 +554,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
             goto out;
 
         /* Create a reference. The reference is created on the local id.  */
-        if(H5Rcreate(&ref, loc_id, pal_name, H5R_OBJECT, -1) < 0)
+        if(H5Rcreate(&ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1) < 0)
             goto out;
 
         /* Write the attribute with the reference */
@@ -604,7 +604,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
             goto out;
 
         /* Create a new reference for this palette. */
-        if ( H5Rcreate( &ref, loc_id, pal_name, H5R_OBJECT, -1 ) < 0)
+        if ( H5Rcreate( &ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1 ) < 0)
             goto out;
 
         refbuf[n_refs] = ref;
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index 6a151d6..5fe53ef 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -869,6 +869,7 @@ int my_yyinput(char *, int);
 #undef YY_INPUT
 #define YY_INPUT(b, r, ms) (r=my_yyinput(b, ms))
 #define token(x)        (int)x
+#define hid(x)      (hid_t)x
 
 #ifdef  YY_BUF_SIZE
 #undef  YY_BUF_SIZE
@@ -912,7 +913,7 @@ extern hbool_t is_opq_tag;
 hbool_t        first_quote = 1;
 
 
-#line 916 "H5LTanalyze.c"
+#line 917 "H5LTanalyze.c"
 
 #define INITIAL 0
 #define TAG_STRING 1
@@ -1087,10 +1088,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 72 "H5LTanalyze.l"
+#line 73 "H5LTanalyze.l"
 
 
-#line 1094 "H5LTanalyze.c"
+#line 1095 "H5LTanalyze.c"
 
 	if ( !(yy_init) )
 		{
@@ -1184,277 +1185,277 @@ do_action:	/* This label is used only to access EOF actions. */
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 74 "H5LTanalyze.l"
-{return token(H5T_STD_I8BE_TOKEN);}
+#line 75 "H5LTanalyze.l"
+{return hid(H5T_STD_I8BE_TOKEN);}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 75 "H5LTanalyze.l"
-{return token(H5T_STD_I8LE_TOKEN);}
+#line 76 "H5LTanalyze.l"
+{return hid(H5T_STD_I8LE_TOKEN);}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 76 "H5LTanalyze.l"
-{return token(H5T_STD_I16BE_TOKEN);}
+#line 77 "H5LTanalyze.l"
+{return hid(H5T_STD_I16BE_TOKEN);}
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 77 "H5LTanalyze.l"
-{return token(H5T_STD_I16LE_TOKEN);}
+#line 78 "H5LTanalyze.l"
+{return hid(H5T_STD_I16LE_TOKEN);}
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 78 "H5LTanalyze.l"
-{return token(H5T_STD_I32BE_TOKEN);}
+#line 79 "H5LTanalyze.l"
+{return hid(H5T_STD_I32BE_TOKEN);}
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 79 "H5LTanalyze.l"
-{return token(H5T_STD_I32LE_TOKEN);}
+#line 80 "H5LTanalyze.l"
+{return hid(H5T_STD_I32LE_TOKEN);}
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 80 "H5LTanalyze.l"
-{return token(H5T_STD_I64BE_TOKEN);}
+#line 81 "H5LTanalyze.l"
+{return hid(H5T_STD_I64BE_TOKEN);}
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 81 "H5LTanalyze.l"
-{return token(H5T_STD_I64LE_TOKEN);}
+#line 82 "H5LTanalyze.l"
+{return hid(H5T_STD_I64LE_TOKEN);}
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 83 "H5LTanalyze.l"
-{return token(H5T_STD_U8BE_TOKEN);}
+#line 84 "H5LTanalyze.l"
+{return hid(H5T_STD_U8BE_TOKEN);}
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 84 "H5LTanalyze.l"
-{return token(H5T_STD_U8LE_TOKEN);}
+#line 85 "H5LTanalyze.l"
+{return hid(H5T_STD_U8LE_TOKEN);}
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 85 "H5LTanalyze.l"
-{return token(H5T_STD_U16BE_TOKEN);}
+#line 86 "H5LTanalyze.l"
+{return hid(H5T_STD_U16BE_TOKEN);}
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 86 "H5LTanalyze.l"
-{return token(H5T_STD_U16LE_TOKEN);}
+#line 87 "H5LTanalyze.l"
+{return hid(H5T_STD_U16LE_TOKEN);}
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 87 "H5LTanalyze.l"
-{return token(H5T_STD_U32BE_TOKEN);}
+#line 88 "H5LTanalyze.l"
+{return hid(H5T_STD_U32BE_TOKEN);}
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 88 "H5LTanalyze.l"
-{return token(H5T_STD_U32LE_TOKEN);}
+#line 89 "H5LTanalyze.l"
+{return hid(H5T_STD_U32LE_TOKEN);}
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 89 "H5LTanalyze.l"
-{return token(H5T_STD_U64BE_TOKEN);}
+#line 90 "H5LTanalyze.l"
+{return hid(H5T_STD_U64BE_TOKEN);}
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 90 "H5LTanalyze.l"
-{return token(H5T_STD_U64LE_TOKEN);}
+#line 91 "H5LTanalyze.l"
+{return hid(H5T_STD_U64LE_TOKEN);}
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 92 "H5LTanalyze.l"
-{return token(H5T_NATIVE_CHAR_TOKEN);}
+#line 93 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_CHAR_TOKEN);}
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 93 "H5LTanalyze.l"
-{return token(H5T_NATIVE_SCHAR_TOKEN);}
+#line 94 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_SCHAR_TOKEN);}
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 94 "H5LTanalyze.l"
-{return token(H5T_NATIVE_UCHAR_TOKEN);}
+#line 95 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_UCHAR_TOKEN);}
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 95 "H5LTanalyze.l"
-{return token(H5T_NATIVE_SHORT_TOKEN);}
+#line 96 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_SHORT_TOKEN);}
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 96 "H5LTanalyze.l"
-{return token(H5T_NATIVE_USHORT_TOKEN);}
+#line 97 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_USHORT_TOKEN);}
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 97 "H5LTanalyze.l"
-{return token(H5T_NATIVE_INT_TOKEN);}
+#line 98 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_INT_TOKEN);}
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 98 "H5LTanalyze.l"
-{return token(H5T_NATIVE_UINT_TOKEN);}
+#line 99 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_UINT_TOKEN);}
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 99 "H5LTanalyze.l"
-{return token(H5T_NATIVE_LONG_TOKEN);}
+#line 100 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_LONG_TOKEN);}
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 100 "H5LTanalyze.l"
-{return token(H5T_NATIVE_ULONG_TOKEN);}
+#line 101 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_ULONG_TOKEN);}
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 101 "H5LTanalyze.l"
-{return token(H5T_NATIVE_LLONG_TOKEN);}
+#line 102 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_LLONG_TOKEN);}
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 102 "H5LTanalyze.l"
-{return token(H5T_NATIVE_ULLONG_TOKEN);}
+#line 103 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_ULLONG_TOKEN);}
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 104 "H5LTanalyze.l"
-{return token(H5T_IEEE_F32BE_TOKEN);}
+#line 105 "H5LTanalyze.l"
+{return hid(H5T_IEEE_F32BE_TOKEN);}
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 105 "H5LTanalyze.l"
-{return token(H5T_IEEE_F32LE_TOKEN);}
+#line 106 "H5LTanalyze.l"
+{return hid(H5T_IEEE_F32LE_TOKEN);}
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 106 "H5LTanalyze.l"
-{return token(H5T_IEEE_F64BE_TOKEN);}
+#line 107 "H5LTanalyze.l"
+{return hid(H5T_IEEE_F64BE_TOKEN);}
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 107 "H5LTanalyze.l"
-{return token(H5T_IEEE_F64LE_TOKEN);}
+#line 108 "H5LTanalyze.l"
+{return hid(H5T_IEEE_F64LE_TOKEN);}
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 108 "H5LTanalyze.l"
-{return token(H5T_NATIVE_FLOAT_TOKEN);}
+#line 109 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_FLOAT_TOKEN);}
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 109 "H5LTanalyze.l"
-{return token(H5T_NATIVE_DOUBLE_TOKEN);}
+#line 110 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_DOUBLE_TOKEN);}
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 110 "H5LTanalyze.l"
-{return token(H5T_NATIVE_LDOUBLE_TOKEN);}
+#line 111 "H5LTanalyze.l"
+{return hid(H5T_NATIVE_LDOUBLE_TOKEN);}
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 112 "H5LTanalyze.l"
+#line 113 "H5LTanalyze.l"
 {return token(H5T_STRING_TOKEN);}
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 113 "H5LTanalyze.l"
+#line 114 "H5LTanalyze.l"
 {return token(STRSIZE_TOKEN);}
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 114 "H5LTanalyze.l"
+#line 115 "H5LTanalyze.l"
 {return token(STRPAD_TOKEN);}
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 115 "H5LTanalyze.l"
+#line 116 "H5LTanalyze.l"
 {return token(CSET_TOKEN);}
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 116 "H5LTanalyze.l"
+#line 117 "H5LTanalyze.l"
 {return token(CTYPE_TOKEN);}
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 117 "H5LTanalyze.l"
+#line 118 "H5LTanalyze.l"
 {return token(H5T_STR_NULLTERM_TOKEN);} 
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 118 "H5LTanalyze.l"
+#line 119 "H5LTanalyze.l"
 {return token(H5T_STR_NULLPAD_TOKEN);} 
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 119 "H5LTanalyze.l"
+#line 120 "H5LTanalyze.l"
 {return token(H5T_STR_SPACEPAD_TOKEN);} 
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 120 "H5LTanalyze.l"
+#line 121 "H5LTanalyze.l"
 {return token(H5T_CSET_ASCII_TOKEN);}
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 121 "H5LTanalyze.l"
+#line 122 "H5LTanalyze.l"
 {return token(H5T_CSET_UTF8_TOKEN);}
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 122 "H5LTanalyze.l"
+#line 123 "H5LTanalyze.l"
 {return token(H5T_C_S1_TOKEN);}
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 123 "H5LTanalyze.l"
+#line 124 "H5LTanalyze.l"
 {return token(H5T_FORTRAN_S1_TOKEN);}
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 124 "H5LTanalyze.l"
+#line 125 "H5LTanalyze.l"
 {return token(H5T_VARIABLE_TOKEN);}
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 126 "H5LTanalyze.l"
+#line 127 "H5LTanalyze.l"
 {return token(H5T_COMPOUND_TOKEN);}
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 127 "H5LTanalyze.l"
+#line 128 "H5LTanalyze.l"
 {return token(H5T_ENUM_TOKEN);}
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 128 "H5LTanalyze.l"
+#line 129 "H5LTanalyze.l"
 {return token(H5T_ARRAY_TOKEN);}
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 129 "H5LTanalyze.l"
+#line 130 "H5LTanalyze.l"
 {return token(H5T_VLEN_TOKEN);}
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 131 "H5LTanalyze.l"
+#line 132 "H5LTanalyze.l"
 {return token(H5T_OPAQUE_TOKEN);}
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 132 "H5LTanalyze.l"
+#line 133 "H5LTanalyze.l"
 {return token(OPQ_SIZE_TOKEN);}
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 133 "H5LTanalyze.l"
+#line 134 "H5LTanalyze.l"
 {return token(OPQ_TAG_TOKEN);}
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 135 "H5LTanalyze.l"
+#line 136 "H5LTanalyze.l"
 {    
                         if( is_str_size || (is_enum && is_enum_memb) || 
                             is_opq_size || (asindex>-1 && arr_stack[asindex].is_dim) ||
@@ -1467,7 +1468,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 145 "H5LTanalyze.l"
+#line 146 "H5LTanalyze.l"
 {
                     /*if it's first quote, and is a compound field name or an enum symbol*/
                     if((is_opq_tag || is_enum || (csindex>-1 && cmpd_stack[csindex].is_field)) 
@@ -1482,7 +1483,7 @@ YY_RULE_SETUP
 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP
-#line 155 "H5LTanalyze.l"
+#line 156 "H5LTanalyze.l"
 {
 #ifdef H5_HAVE_WIN32_API
                     H5LTyylval.sval = _strdup(H5LTyytext);
@@ -1495,52 +1496,52 @@ YY_RULE_SETUP
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 165 "H5LTanalyze.l"
+#line 166 "H5LTanalyze.l"
 {return token('{');}
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 166 "H5LTanalyze.l"
+#line 167 "H5LTanalyze.l"
 {return token('}');}
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 167 "H5LTanalyze.l"
+#line 168 "H5LTanalyze.l"
 {return token('[');}
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 168 "H5LTanalyze.l"
+#line 169 "H5LTanalyze.l"
 {return token(']');}
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 169 "H5LTanalyze.l"
+#line 170 "H5LTanalyze.l"
 {return token(':');}
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 170 "H5LTanalyze.l"
+#line 171 "H5LTanalyze.l"
 {return token(';');}
 	YY_BREAK
 case 64:
 /* rule 64 can match eol */
 YY_RULE_SETUP
-#line 171 "H5LTanalyze.l"
+#line 172 "H5LTanalyze.l"
 ;
 	YY_BREAK
 case 65:
 /* rule 65 can match eol */
 YY_RULE_SETUP
-#line 172 "H5LTanalyze.l"
+#line 173 "H5LTanalyze.l"
 { return 0; }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 174 "H5LTanalyze.l"
+#line 175 "H5LTanalyze.l"
 ECHO;
 	YY_BREAK
-#line 1544 "H5LTanalyze.c"
+#line 1545 "H5LTanalyze.c"
 			case YY_STATE_EOF(INITIAL):
 			case YY_STATE_EOF(TAG_STRING):
 				yyterminate();
@@ -2509,7 +2510,7 @@ void H5LTyyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 174 "H5LTanalyze.l"
+#line 175 "H5LTanalyze.l"
 
 
 int my_yyinput(char *buf, int max_size)
diff --git a/hl/src/H5LTanalyze.l b/hl/src/H5LTanalyze.l
index 9682f78..6c883fc 100644
--- a/hl/src/H5LTanalyze.l
+++ b/hl/src/H5LTanalyze.l
@@ -23,6 +23,7 @@ int my_yyinput(char *, int);
 #undef YY_INPUT
 #define YY_INPUT(b, r, ms) (r=my_yyinput(b, ms))
 #define token(x)        (int)x
+#define hid(x)          (hid_t)x
 
 #ifdef  YY_BUF_SIZE
 #undef  YY_BUF_SIZE
@@ -71,43 +72,43 @@ hbool_t        first_quote = 1;
 
 %%
 
-H5T_STD_I8BE     {return token(H5T_STD_I8BE_TOKEN);}
-H5T_STD_I8LE     {return token(H5T_STD_I8LE_TOKEN);}
-H5T_STD_I16BE    {return token(H5T_STD_I16BE_TOKEN);}
-H5T_STD_I16LE    {return token(H5T_STD_I16LE_TOKEN);}
-H5T_STD_I32BE    {return token(H5T_STD_I32BE_TOKEN);}
-H5T_STD_I32LE    {return token(H5T_STD_I32LE_TOKEN);}
-H5T_STD_I64BE    {return token(H5T_STD_I64BE_TOKEN);}
-H5T_STD_I64LE    {return token(H5T_STD_I64LE_TOKEN);}
-
-H5T_STD_U8BE     {return token(H5T_STD_U8BE_TOKEN);}
-H5T_STD_U8LE     {return token(H5T_STD_U8LE_TOKEN);}
-H5T_STD_U16BE    {return token(H5T_STD_U16BE_TOKEN);}
-H5T_STD_U16LE    {return token(H5T_STD_U16LE_TOKEN);}
-H5T_STD_U32BE    {return token(H5T_STD_U32BE_TOKEN);}
-H5T_STD_U32LE    {return token(H5T_STD_U32LE_TOKEN);}
-H5T_STD_U64BE    {return token(H5T_STD_U64BE_TOKEN);}
-H5T_STD_U64LE    {return token(H5T_STD_U64LE_TOKEN);}
-
-H5T_NATIVE_CHAR  {return token(H5T_NATIVE_CHAR_TOKEN);}
-H5T_NATIVE_SCHAR {return token(H5T_NATIVE_SCHAR_TOKEN);}
-H5T_NATIVE_UCHAR {return token(H5T_NATIVE_UCHAR_TOKEN);}
-H5T_NATIVE_SHORT {return token(H5T_NATIVE_SHORT_TOKEN);}
-H5T_NATIVE_USHORT  {return token(H5T_NATIVE_USHORT_TOKEN);}
-H5T_NATIVE_INT   {return token(H5T_NATIVE_INT_TOKEN);}
-H5T_NATIVE_UINT  {return token(H5T_NATIVE_UINT_TOKEN);}
-H5T_NATIVE_LONG  {return token(H5T_NATIVE_LONG_TOKEN);}
-H5T_NATIVE_ULONG {return token(H5T_NATIVE_ULONG_TOKEN);}
-H5T_NATIVE_LLONG   {return token(H5T_NATIVE_LLONG_TOKEN);}
-H5T_NATIVE_ULLONG  {return token(H5T_NATIVE_ULLONG_TOKEN);}
-
-H5T_IEEE_F32BE   {return token(H5T_IEEE_F32BE_TOKEN);}
-H5T_IEEE_F32LE   {return token(H5T_IEEE_F32LE_TOKEN);}
-H5T_IEEE_F64BE   {return token(H5T_IEEE_F64BE_TOKEN);}
-H5T_IEEE_F64LE   {return token(H5T_IEEE_F64LE_TOKEN);}
-H5T_NATIVE_FLOAT   {return token(H5T_NATIVE_FLOAT_TOKEN);}
-H5T_NATIVE_DOUBLE  {return token(H5T_NATIVE_DOUBLE_TOKEN);}
-H5T_NATIVE_LDOUBLE {return token(H5T_NATIVE_LDOUBLE_TOKEN);}
+H5T_STD_I8BE     {return hid(H5T_STD_I8BE_TOKEN);}
+H5T_STD_I8LE     {return hid(H5T_STD_I8LE_TOKEN);}
+H5T_STD_I16BE    {return hid(H5T_STD_I16BE_TOKEN);}
+H5T_STD_I16LE    {return hid(H5T_STD_I16LE_TOKEN);}
+H5T_STD_I32BE    {return hid(H5T_STD_I32BE_TOKEN);}
+H5T_STD_I32LE    {return hid(H5T_STD_I32LE_TOKEN);}
+H5T_STD_I64BE    {return hid(H5T_STD_I64BE_TOKEN);}
+H5T_STD_I64LE    {return hid(H5T_STD_I64LE_TOKEN);}
+
+H5T_STD_U8BE     {return hid(H5T_STD_U8BE_TOKEN);}
+H5T_STD_U8LE     {return hid(H5T_STD_U8LE_TOKEN);}
+H5T_STD_U16BE    {return hid(H5T_STD_U16BE_TOKEN);}
+H5T_STD_U16LE    {return hid(H5T_STD_U16LE_TOKEN);}
+H5T_STD_U32BE    {return hid(H5T_STD_U32BE_TOKEN);}
+H5T_STD_U32LE    {return hid(H5T_STD_U32LE_TOKEN);}
+H5T_STD_U64BE    {return hid(H5T_STD_U64BE_TOKEN);}
+H5T_STD_U64LE    {return hid(H5T_STD_U64LE_TOKEN);}
+
+H5T_NATIVE_CHAR  {return hid(H5T_NATIVE_CHAR_TOKEN);}
+H5T_NATIVE_SCHAR {return hid(H5T_NATIVE_SCHAR_TOKEN);}
+H5T_NATIVE_UCHAR {return hid(H5T_NATIVE_UCHAR_TOKEN);}
+H5T_NATIVE_SHORT {return hid(H5T_NATIVE_SHORT_TOKEN);}
+H5T_NATIVE_USHORT  {return hid(H5T_NATIVE_USHORT_TOKEN);}
+H5T_NATIVE_INT   {return hid(H5T_NATIVE_INT_TOKEN);}
+H5T_NATIVE_UINT  {return hid(H5T_NATIVE_UINT_TOKEN);}
+H5T_NATIVE_LONG  {return hid(H5T_NATIVE_LONG_TOKEN);}
+H5T_NATIVE_ULONG {return hid(H5T_NATIVE_ULONG_TOKEN);}
+H5T_NATIVE_LLONG   {return hid(H5T_NATIVE_LLONG_TOKEN);}
+H5T_NATIVE_ULLONG  {return hid(H5T_NATIVE_ULLONG_TOKEN);}
+
+H5T_IEEE_F32BE   {return hid(H5T_IEEE_F32BE_TOKEN);}
+H5T_IEEE_F32LE   {return hid(H5T_IEEE_F32LE_TOKEN);}
+H5T_IEEE_F64BE   {return hid(H5T_IEEE_F64BE_TOKEN);}
+H5T_IEEE_F64LE   {return hid(H5T_IEEE_F64LE_TOKEN);}
+H5T_NATIVE_FLOAT   {return hid(H5T_NATIVE_FLOAT_TOKEN);}
+H5T_NATIVE_DOUBLE  {return hid(H5T_NATIVE_DOUBLE_TOKEN);}
+H5T_NATIVE_LDOUBLE {return hid(H5T_NATIVE_LDOUBLE_TOKEN);}
 
 H5T_STRING       {return token(H5T_STRING_TOKEN);}
 STRSIZE          {return token(STRSIZE_TOKEN);}
diff --git a/hl/src/H5LTparse.c b/hl/src/H5LTparse.c
index 240a8d3..e9a3ec9 100644
--- a/hl/src/H5LTparse.c
+++ b/hl/src/H5LTparse.c
@@ -226,12 +226,13 @@ typedef union YYSTYPE
 /* Line 387 of yacc.c  */
 #line 68 "H5LTparse.y"
 
-    int   ival;         /*for integer token*/
-    char  *sval;        /*for name string*/
+    int     ival;         /*for integer token*/
+    char    *sval;        /*for name string*/
+    hid_t   hid;          /*for hid_t token*/
 
 
 /* Line 387 of yacc.c  */
-#line 235 "H5LTparse.c"
+#line 236 "H5LTparse.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -242,15 +243,15 @@ extern YYSTYPE H5LTyylval;
 
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
-int H5LTyyparse (void *YYPARSE_PARAM);
+hid_t H5LTyyparse (void *YYPARSE_PARAM);
 #else
-int H5LTyyparse ();
+hid_t H5LTyyparse ();
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int H5LTyyparse (void);
+hid_t H5LTyyparse (void);
 #else
-int H5LTyyparse ();
+hid_t H5LTyyparse ();
 #endif
 #endif /* ! YYPARSE_PARAM */
 
@@ -259,7 +260,7 @@ int H5LTyyparse ();
 /* Copy the second part of user declarations.  */
 
 /* Line 390 of yacc.c  */
-#line 263 "H5LTparse.c"
+#line 264 "H5LTparse.c"
 
 #ifdef short
 # undef short
@@ -583,16 +584,16 @@ static const yytype_int8 yyrhs[] =
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   100,   100,   101,   103,   104,   105,   106,   108,   109,
-     110,   111,   112,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     144,   145,   146,   147,   148,   149,   150,   154,   153,   162,
-     163,   165,   165,   199,   205,   206,   209,   211,   211,   220,
-     221,   223,   224,   223,   231,   234,   240,   241,   246,   247,
-     238,   253,   255,   259,   260,   268,   277,   284,   257,   308,
-     309,   311,   312,   313,   315,   316,   318,   319,   323,   322,
-     327,   328,   330,   330,   382,   384
+       0,   101,   101,   102,   104,   105,   106,   107,   109,   110,
+     111,   112,   113,   116,   117,   118,   119,   120,   121,   122,
+     123,   124,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
+     145,   146,   147,   148,   149,   150,   151,   155,   154,   163,
+     164,   166,   166,   200,   206,   207,   210,   212,   212,   221,
+     222,   224,   225,   224,   232,   235,   241,   242,   247,   248,
+     239,   254,   256,   260,   261,   269,   278,   285,   258,   309,
+     310,   312,   313,   314,   316,   317,   319,   320,   324,   323,
+     328,   329,   331,   331,   383,   385
 };
 #endif
 
@@ -625,11 +626,12 @@ static const char *const yytname[] =
   "NUMBER", "'{'", "'}'", "'['", "']'", "'\"'", "':'", "';'", "$accept",
   "start", "ddl_type", "atomic_type", "integer_type", "fp_type",
   "compound_type", "$@1", "memb_list", "memb_def", "$@2", "field_name",
-  "field_offset", "offset", "array_type", "$@3", "dim_list", "dim", "$@4",
-  "$@5", "dimsize", "vlen_type", "opaque_type", "$@6", "@7", "$@8", "$@9",
-  "opaque_size", "opaque_tag", "string_type", "$@10", "$@11", "$@12",
-  "$@13", "@14", "strsize", "strpad", "cset", "ctype", "enum_type", "$@15",
-  "enum_list", "enum_def", "$@16", "enum_symbol", "enum_val", YY_NULL
+  "field_offset", "offset", "array_type", "$@3", "dim_list", "dim",
+  "$@4", "$@5", "dimsize", "vlen_type", "opaque_type", "$@6", "@7",
+  "$@8", "$@9", "opaque_size", "opaque_tag", "string_type", "$@10",
+  "$@11", "$@12", "$@13", "@14", "strsize", "strpad", "cset", "ctype",
+  "enum_type", "$@15", "enum_list", "enum_def", "$@16", "enum_symbol",
+  "enum_val", YY_NULL
 };
 #endif
 
@@ -1369,20 +1371,20 @@ int yynerrs;
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
-int
+hid_t
 yyparse (void *YYPARSE_PARAM)
 #else
-int
+hid_t
 yyparse (YYPARSE_PARAM)
     void *YYPARSE_PARAM;
 #endif
 #else /* ! YYPARSE_PARAM */
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
-int
+hid_t
 yyparse (void)
 #else
-int
+hid_t
 yyparse ()
 
 #endif
@@ -1622,230 +1624,230 @@ yyreduce:
     {
         case 2:
 /* Line 1807 of yacc.c  */
-#line 100 "H5LTparse.y"
+#line 101 "H5LTparse.y"
     { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ }
     break;
 
   case 3:
 /* Line 1807 of yacc.c  */
-#line 101 "H5LTparse.y"
-    { return (yyval.ival);}
+#line 102 "H5LTparse.y"
+    { return (yyval.hid);}
     break;
 
   case 13:
 /* Line 1807 of yacc.c  */
-#line 115 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I8BE); }
+#line 116 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I8BE); }
     break;
 
   case 14:
 /* Line 1807 of yacc.c  */
-#line 116 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I8LE); }
+#line 117 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I8LE); }
     break;
 
   case 15:
 /* Line 1807 of yacc.c  */
-#line 117 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I16BE); }
+#line 118 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I16BE); }
     break;
 
   case 16:
 /* Line 1807 of yacc.c  */
-#line 118 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I16LE); }
+#line 119 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I16LE); }
     break;
 
   case 17:
 /* Line 1807 of yacc.c  */
-#line 119 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I32BE); }
+#line 120 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I32BE); }
     break;
 
   case 18:
 /* Line 1807 of yacc.c  */
-#line 120 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I32LE); }
+#line 121 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I32LE); }
     break;
 
   case 19:
 /* Line 1807 of yacc.c  */
-#line 121 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I64BE); }
+#line 122 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I64BE); }
     break;
 
   case 20:
 /* Line 1807 of yacc.c  */
-#line 122 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_I64LE); }
+#line 123 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_I64LE); }
     break;
 
   case 21:
 /* Line 1807 of yacc.c  */
-#line 123 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U8BE); }
+#line 124 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U8BE); }
     break;
 
   case 22:
 /* Line 1807 of yacc.c  */
-#line 124 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U8LE); }
+#line 125 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U8LE); }
     break;
 
   case 23:
 /* Line 1807 of yacc.c  */
-#line 125 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U16BE); }
+#line 126 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U16BE); }
     break;
 
   case 24:
 /* Line 1807 of yacc.c  */
-#line 126 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U16LE); }
+#line 127 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U16LE); }
     break;
 
   case 25:
 /* Line 1807 of yacc.c  */
-#line 127 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U32BE); }
+#line 128 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U32BE); }
     break;
 
   case 26:
 /* Line 1807 of yacc.c  */
-#line 128 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U32LE); }
+#line 129 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U32LE); }
     break;
 
   case 27:
 /* Line 1807 of yacc.c  */
-#line 129 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U64BE); }
+#line 130 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U64BE); }
     break;
 
   case 28:
 /* Line 1807 of yacc.c  */
-#line 130 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_STD_U64LE); }
+#line 131 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_STD_U64LE); }
     break;
 
   case 29:
 /* Line 1807 of yacc.c  */
-#line 131 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_CHAR); }
+#line 132 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_CHAR); }
     break;
 
   case 30:
 /* Line 1807 of yacc.c  */
-#line 132 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_SCHAR); }
+#line 133 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_SCHAR); }
     break;
 
   case 31:
 /* Line 1807 of yacc.c  */
-#line 133 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_UCHAR); }
+#line 134 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_UCHAR); }
     break;
 
   case 32:
 /* Line 1807 of yacc.c  */
-#line 134 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_SHORT); }
+#line 135 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_SHORT); }
     break;
 
   case 33:
 /* Line 1807 of yacc.c  */
-#line 135 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_USHORT); }
+#line 136 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_USHORT); }
     break;
 
   case 34:
 /* Line 1807 of yacc.c  */
-#line 136 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_INT); }
+#line 137 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_INT); }
     break;
 
   case 35:
 /* Line 1807 of yacc.c  */
-#line 137 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_UINT); }
+#line 138 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_UINT); }
     break;
 
   case 36:
 /* Line 1807 of yacc.c  */
-#line 138 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_LONG); }
+#line 139 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_LONG); }
     break;
 
   case 37:
 /* Line 1807 of yacc.c  */
-#line 139 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_ULONG); }
+#line 140 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULONG); }
     break;
 
   case 38:
 /* Line 1807 of yacc.c  */
-#line 140 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_LLONG); }
+#line 141 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_LLONG); }
     break;
 
   case 39:
 /* Line 1807 of yacc.c  */
-#line 141 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_ULLONG); }
+#line 142 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_ULLONG); }
     break;
 
   case 40:
 /* Line 1807 of yacc.c  */
-#line 144 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_IEEE_F32BE); }
+#line 145 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_IEEE_F32BE); }
     break;
 
   case 41:
 /* Line 1807 of yacc.c  */
-#line 145 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_IEEE_F32LE); }
+#line 146 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_IEEE_F32LE); }
     break;
 
   case 42:
 /* Line 1807 of yacc.c  */
-#line 146 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_IEEE_F64BE); }
+#line 147 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_IEEE_F64BE); }
     break;
 
   case 43:
 /* Line 1807 of yacc.c  */
-#line 147 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_IEEE_F64LE); }
+#line 148 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_IEEE_F64LE); }
     break;
 
   case 44:
 /* Line 1807 of yacc.c  */
-#line 148 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_FLOAT); }
+#line 149 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_FLOAT); }
     break;
 
   case 45:
 /* Line 1807 of yacc.c  */
-#line 149 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_DOUBLE); }
+#line 150 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_DOUBLE); }
     break;
 
   case 46:
 /* Line 1807 of yacc.c  */
-#line 150 "H5LTparse.y"
-    { (yyval.ival) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
+#line 151 "H5LTparse.y"
+    { (yyval.hid) = H5Tcopy(H5T_NATIVE_LDOUBLE); }
     break;
 
   case 47:
 /* Line 1807 of yacc.c  */
-#line 154 "H5LTparse.y"
+#line 155 "H5LTparse.y"
     { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ }
     break;
 
   case 48:
 /* Line 1807 of yacc.c  */
-#line 156 "H5LTparse.y"
-    { (yyval.ival) = cmpd_stack[csindex].id; 
+#line 157 "H5LTparse.y"
+    { (yyval.hid) = cmpd_stack[csindex].id; 
                               cmpd_stack[csindex].id = 0;
                               cmpd_stack[csindex].first_memb = 1; 
                               csindex--;
@@ -1854,41 +1856,41 @@ yyreduce:
 
   case 51:
 /* Line 1807 of yacc.c  */
-#line 165 "H5LTparse.y"
+#line 166 "H5LTparse.y"
     { cmpd_stack[csindex].is_field = 1; /*notify lexer a compound member is parsed*/ }
     break;
 
   case 52:
 /* Line 1807 of yacc.c  */
-#line 167 "H5LTparse.y"
+#line 168 "H5LTparse.y"
     {   
                             size_t origin_size, new_size;
                             hid_t dtype_id = cmpd_stack[csindex].id;
 
                             /*Adjust size and insert member, consider both member size and offset.*/
                             if(cmpd_stack[csindex].first_memb) { /*reclaim the size 1 temporarily set*/
-                                new_size = H5Tget_size((yyvsp[(1) - (7)].ival)) + (yyvsp[(6) - (7)].ival);
+                                new_size = H5Tget_size((yyvsp[(1) - (7)].hid)) + (yyvsp[(6) - (7)].ival);
                                 H5Tset_size(dtype_id, new_size);
                                 /*member name is saved in yylval.sval by lexer*/
-                                H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].ival));
+                                H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].hid));
 
                                 cmpd_stack[csindex].first_memb = 0;
                             } else {
                                 origin_size = H5Tget_size(dtype_id);
                                 
                                 if((yyvsp[(6) - (7)].ival) == 0) {
-                                    new_size = origin_size + H5Tget_size((yyvsp[(1) - (7)].ival));
+                                    new_size = origin_size + H5Tget_size((yyvsp[(1) - (7)].hid));
                                     H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), origin_size, (yyvsp[(1) - (7)].ival));
+                                    H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), origin_size, (yyvsp[(1) - (7)].hid));
                                 } else {
-                                    new_size = (yyvsp[(6) - (7)].ival) + H5Tget_size((yyvsp[(1) - (7)].ival));
+                                    new_size = (yyvsp[(6) - (7)].ival) + H5Tget_size((yyvsp[(1) - (7)].hid));
                                     H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].ival));
+                                    H5Tinsert(dtype_id, (yyvsp[(4) - (7)].sval), (yyvsp[(6) - (7)].ival), (yyvsp[(1) - (7)].hid));
                                 }
                             }
                           
                             cmpd_stack[csindex].is_field = 0;
-                            H5Tclose((yyvsp[(1) - (7)].ival));
+                            H5Tclose((yyvsp[(1) - (7)].hid));
                              
                             new_size = H5Tget_size(dtype_id);
                         }
@@ -1896,7 +1898,7 @@ yyreduce:
 
   case 53:
 /* Line 1807 of yacc.c  */
-#line 200 "H5LTparse.y"
+#line 201 "H5LTparse.y"
     {
                             (yyval.sval) = yylval.sval;
                         }
@@ -1904,42 +1906,42 @@ yyreduce:
 
   case 54:
 /* Line 1807 of yacc.c  */
-#line 205 "H5LTparse.y"
+#line 206 "H5LTparse.y"
     { (yyval.ival) = 0; }
     break;
 
   case 55:
 /* Line 1807 of yacc.c  */
-#line 207 "H5LTparse.y"
+#line 208 "H5LTparse.y"
     { (yyval.ival) = yylval.ival; }
     break;
 
   case 57:
 /* Line 1807 of yacc.c  */
-#line 211 "H5LTparse.y"
+#line 212 "H5LTparse.y"
     { asindex++; /*pushd onto the stack*/ }
     break;
 
   case 58:
 /* Line 1807 of yacc.c  */
-#line 213 "H5LTparse.y"
+#line 214 "H5LTparse.y"
     { 
-                          (yyval.ival) = H5Tarray_create2((yyvsp[(5) - (6)].ival), arr_stack[asindex].ndims, arr_stack[asindex].dims);
+                          (yyval.hid) = H5Tarray_create2((yyvsp[(5) - (6)].hid), arr_stack[asindex].ndims, arr_stack[asindex].dims);
                           arr_stack[asindex].ndims = 0;
                           asindex--;
-                          H5Tclose((yyvsp[(5) - (6)].ival));
+                          H5Tclose((yyvsp[(5) - (6)].hid));
                         }
     break;
 
   case 61:
 /* Line 1807 of yacc.c  */
-#line 223 "H5LTparse.y"
+#line 224 "H5LTparse.y"
     { arr_stack[asindex].is_dim = 1; /*notice lexer of dimension size*/ }
     break;
 
   case 62:
 /* Line 1807 of yacc.c  */
-#line 224 "H5LTparse.y"
+#line 225 "H5LTparse.y"
     { unsigned ndims = arr_stack[asindex].ndims;
                                   arr_stack[asindex].dims[ndims] = (hsize_t)yylval.ival; 
                                   arr_stack[asindex].ndims++;
@@ -1949,56 +1951,56 @@ yyreduce:
 
   case 65:
 /* Line 1807 of yacc.c  */
-#line 235 "H5LTparse.y"
-    { (yyval.ival) = H5Tvlen_create((yyvsp[(3) - (4)].ival)); H5Tclose((yyvsp[(3) - (4)].ival)); }
+#line 236 "H5LTparse.y"
+    { (yyval.hid) = H5Tvlen_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
     break;
 
   case 66:
 /* Line 1807 of yacc.c  */
-#line 240 "H5LTparse.y"
+#line 241 "H5LTparse.y"
     { is_opq_size = 1; }
     break;
 
   case 67:
 /* Line 1807 of yacc.c  */
-#line 241 "H5LTparse.y"
+#line 242 "H5LTparse.y"
     {   
                                 size_t size = (size_t)yylval.ival;
-                                (yyval.ival) = H5Tcreate(H5T_OPAQUE, size);
+                                (yyval.hid) = H5Tcreate(H5T_OPAQUE, size);
                                 is_opq_size = 0;    
                             }
     break;
 
   case 68:
 /* Line 1807 of yacc.c  */
-#line 246 "H5LTparse.y"
+#line 247 "H5LTparse.y"
     { is_opq_tag = 1; }
     break;
 
   case 69:
 /* Line 1807 of yacc.c  */
-#line 247 "H5LTparse.y"
+#line 248 "H5LTparse.y"
     {  
-                                H5Tset_tag((yyvsp[(7) - (13)].ival), yylval.sval);
+                                H5Tset_tag((yyvsp[(7) - (13)].hid), yylval.sval);
                                 is_opq_tag = 0;
                             }
     break;
 
   case 70:
 /* Line 1807 of yacc.c  */
-#line 251 "H5LTparse.y"
-    { (yyval.ival) = (yyvsp[(7) - (15)].ival); }
+#line 252 "H5LTparse.y"
+    { (yyval.hid) = (yyvsp[(7) - (15)].hid); }
     break;
 
   case 73:
 /* Line 1807 of yacc.c  */
-#line 259 "H5LTparse.y"
+#line 260 "H5LTparse.y"
     { is_str_size = 1; }
     break;
 
   case 74:
 /* Line 1807 of yacc.c  */
-#line 260 "H5LTparse.y"
+#line 261 "H5LTparse.y"
     {  
                                 if((yyvsp[(5) - (6)].ival) == H5T_VARIABLE_TOKEN)
                                     is_variable = 1;
@@ -2010,7 +2012,7 @@ yyreduce:
 
   case 75:
 /* Line 1807 of yacc.c  */
-#line 268 "H5LTparse.y"
+#line 269 "H5LTparse.y"
     {
                                 if((yyvsp[(9) - (10)].ival) == H5T_STR_NULLTERM_TOKEN)
                                     str_pad = H5T_STR_NULLTERM;
@@ -2023,7 +2025,7 @@ yyreduce:
 
   case 76:
 /* Line 1807 of yacc.c  */
-#line 277 "H5LTparse.y"
+#line 278 "H5LTparse.y"
     {  
                                 if((yyvsp[(13) - (14)].ival) == H5T_CSET_ASCII_TOKEN)
                                     str_cset = H5T_CSET_ASCII;
@@ -2034,20 +2036,20 @@ yyreduce:
 
   case 77:
 /* Line 1807 of yacc.c  */
-#line 284 "H5LTparse.y"
+#line 285 "H5LTparse.y"
     {
-                                if((yyvsp[(17) - (18)].ival) == H5T_C_S1_TOKEN)
-                                    (yyval.ival) = H5Tcopy(H5T_C_S1);
-                                else if((yyvsp[(17) - (18)].ival) == H5T_FORTRAN_S1_TOKEN)
-                                    (yyval.ival) = H5Tcopy(H5T_FORTRAN_S1);
+                                if((yyvsp[(17) - (18)].hid) == H5T_C_S1_TOKEN)
+                                    (yyval.hid) = H5Tcopy(H5T_C_S1);
+                                else if((yyvsp[(17) - (18)].hid) == H5T_FORTRAN_S1_TOKEN)
+                                    (yyval.hid) = H5Tcopy(H5T_FORTRAN_S1);
                             }
     break;
 
   case 78:
 /* Line 1807 of yacc.c  */
-#line 291 "H5LTparse.y"
+#line 292 "H5LTparse.y"
     {   
-                                hid_t str_id = (yyvsp[(19) - (20)].ival);
+                                hid_t str_id = (yyvsp[(19) - (20)].hid);
 
                                 /*set string size*/
                                 if(is_variable) {
@@ -2060,73 +2062,73 @@ yyreduce:
                                 H5Tset_strpad(str_id, str_pad);
                                 H5Tset_cset(str_id, str_cset);
 
-                                (yyval.ival) = str_id; 
+                                (yyval.hid) = str_id; 
                             }
     break;
 
   case 79:
 /* Line 1807 of yacc.c  */
-#line 308 "H5LTparse.y"
+#line 309 "H5LTparse.y"
     {(yyval.ival) = H5T_VARIABLE_TOKEN;}
     break;
 
   case 81:
 /* Line 1807 of yacc.c  */
-#line 311 "H5LTparse.y"
+#line 312 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLTERM_TOKEN;}
     break;
 
   case 82:
 /* Line 1807 of yacc.c  */
-#line 312 "H5LTparse.y"
+#line 313 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_NULLPAD_TOKEN;}
     break;
 
   case 83:
 /* Line 1807 of yacc.c  */
-#line 313 "H5LTparse.y"
+#line 314 "H5LTparse.y"
     {(yyval.ival) = H5T_STR_SPACEPAD_TOKEN;}
     break;
 
   case 84:
 /* Line 1807 of yacc.c  */
-#line 315 "H5LTparse.y"
+#line 316 "H5LTparse.y"
     {(yyval.ival) = H5T_CSET_ASCII_TOKEN;}
     break;
 
   case 85:
 /* Line 1807 of yacc.c  */
-#line 316 "H5LTparse.y"
+#line 317 "H5LTparse.y"
     {(yyval.ival) = H5T_CSET_UTF8_TOKEN;}
     break;
 
   case 86:
 /* Line 1807 of yacc.c  */
-#line 318 "H5LTparse.y"
-    {(yyval.ival) = H5T_C_S1_TOKEN;}
+#line 319 "H5LTparse.y"
+    {(yyval.hid) = H5T_C_S1_TOKEN;}
     break;
 
   case 87:
 /* Line 1807 of yacc.c  */
-#line 319 "H5LTparse.y"
-    {(yyval.ival) = H5T_FORTRAN_S1_TOKEN;}
+#line 320 "H5LTparse.y"
+    {(yyval.hid) = H5T_FORTRAN_S1_TOKEN;}
     break;
 
   case 88:
 /* Line 1807 of yacc.c  */
-#line 323 "H5LTparse.y"
-    { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].ival)); H5Tclose((yyvsp[(3) - (4)].ival)); }
+#line 324 "H5LTparse.y"
+    { is_enum = 1; enum_id = H5Tenum_create((yyvsp[(3) - (4)].hid)); H5Tclose((yyvsp[(3) - (4)].hid)); }
     break;
 
   case 89:
 /* Line 1807 of yacc.c  */
-#line 325 "H5LTparse.y"
-    { is_enum = 0; /*reset*/ (yyval.ival) = enum_id; }
+#line 326 "H5LTparse.y"
+    { is_enum = 0; /*reset*/ (yyval.hid) = enum_id; }
     break;
 
   case 92:
 /* Line 1807 of yacc.c  */
-#line 330 "H5LTparse.y"
+#line 331 "H5LTparse.y"
     {
                                                 is_enum_memb = 1; /*indicate member of enum*/
 #ifdef H5_HAVE_WIN32_API
@@ -2139,7 +2141,7 @@ yyreduce:
 
   case 93:
 /* Line 1807 of yacc.c  */
-#line 339 "H5LTparse.y"
+#line 340 "H5LTparse.y"
     {
                                 char char_val=(char)yylval.ival;
                                 short short_val=(short)yylval.ival;
@@ -2186,7 +2188,7 @@ yyreduce:
 
 
 /* Line 1807 of yacc.c  */
-#line 2190 "H5LTparse.c"
+#line 2192 "H5LTparse.c"
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/hl/src/H5LTparse.h b/hl/src/H5LTparse.h
index f40c822..621dacd 100644
--- a/hl/src/H5LTparse.h
+++ b/hl/src/H5LTparse.h
@@ -112,12 +112,13 @@ typedef union YYSTYPE
 /* Line 2065 of yacc.c  */
 #line 68 "H5LTparse.y"
 
-    int   ival;         /*for integer token*/
-    char  *sval;        /*for name string*/
+    int     ival;         /*for integer token*/
+    char    *sval;        /*for name string*/
+    hid_t   hid;          /*for hid_t token*/
 
 
 /* Line 2065 of yacc.c  */
-#line 121 "H5LTparse.h"
+#line 122 "H5LTparse.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/hl/src/H5LTparse.y b/hl/src/H5LTparse.y
index d4c786c..4c07533 100644
--- a/hl/src/H5LTparse.y
+++ b/hl/src/H5LTparse.y
@@ -66,20 +66,21 @@ hbool_t is_opq_tag = 0;             /*flag to lexer for opaque type tag*/
 
 %}
 %union {
-    int   ival;         /*for integer token*/
-    char  *sval;        /*for name string*/
+    int     ival;         /*for integer token*/
+    char    *sval;        /*for name string*/
+    hid_t   hid;          /*for hid_t token*/
 }
 
-%token <ival> H5T_STD_I8BE_TOKEN H5T_STD_I8LE_TOKEN H5T_STD_I16BE_TOKEN  H5T_STD_I16LE_TOKEN
-%token <ival> H5T_STD_I32BE_TOKEN H5T_STD_I32LE_TOKEN H5T_STD_I64BE_TOKEN H5T_STD_I64LE_TOKEN
-%token <ival> H5T_STD_U8BE_TOKEN H5T_STD_U8LE_TOKEN H5T_STD_U16BE_TOKEN  H5T_STD_U16LE_TOKEN
-%token <ival> H5T_STD_U32BE_TOKEN H5T_STD_U32LE_TOKEN H5T_STD_U64BE_TOKEN H5T_STD_U64LE_TOKEN
-%token <ival> H5T_NATIVE_CHAR_TOKEN H5T_NATIVE_SCHAR_TOKEN H5T_NATIVE_UCHAR_TOKEN 
-%token <ival> H5T_NATIVE_SHORT_TOKEN H5T_NATIVE_USHORT_TOKEN H5T_NATIVE_INT_TOKEN H5T_NATIVE_UINT_TOKEN 
-%token <ival> H5T_NATIVE_LONG_TOKEN H5T_NATIVE_ULONG_TOKEN H5T_NATIVE_LLONG_TOKEN H5T_NATIVE_ULLONG_TOKEN
+%token <hid> H5T_STD_I8BE_TOKEN H5T_STD_I8LE_TOKEN H5T_STD_I16BE_TOKEN  H5T_STD_I16LE_TOKEN
+%token <hid> H5T_STD_I32BE_TOKEN H5T_STD_I32LE_TOKEN H5T_STD_I64BE_TOKEN H5T_STD_I64LE_TOKEN
+%token <hid> H5T_STD_U8BE_TOKEN H5T_STD_U8LE_TOKEN H5T_STD_U16BE_TOKEN  H5T_STD_U16LE_TOKEN
+%token <hid> H5T_STD_U32BE_TOKEN H5T_STD_U32LE_TOKEN H5T_STD_U64BE_TOKEN H5T_STD_U64LE_TOKEN
+%token <hid> H5T_NATIVE_CHAR_TOKEN H5T_NATIVE_SCHAR_TOKEN H5T_NATIVE_UCHAR_TOKEN 
+%token <hid> H5T_NATIVE_SHORT_TOKEN H5T_NATIVE_USHORT_TOKEN H5T_NATIVE_INT_TOKEN H5T_NATIVE_UINT_TOKEN 
+%token <hid> H5T_NATIVE_LONG_TOKEN H5T_NATIVE_ULONG_TOKEN H5T_NATIVE_LLONG_TOKEN H5T_NATIVE_ULLONG_TOKEN
 
-%token <ival> H5T_IEEE_F32BE_TOKEN H5T_IEEE_F32LE_TOKEN H5T_IEEE_F64BE_TOKEN H5T_IEEE_F64LE_TOKEN
-%token <ival> H5T_NATIVE_FLOAT_TOKEN H5T_NATIVE_DOUBLE_TOKEN H5T_NATIVE_LDOUBLE_TOKEN
+%token <hid> H5T_IEEE_F32BE_TOKEN H5T_IEEE_F32LE_TOKEN H5T_IEEE_F64BE_TOKEN H5T_IEEE_F64LE_TOKEN
+%token <hid> H5T_NATIVE_FLOAT_TOKEN H5T_NATIVE_DOUBLE_TOKEN H5T_NATIVE_LDOUBLE_TOKEN
 
 %token <ival> H5T_STRING_TOKEN STRSIZE_TOKEN STRPAD_TOKEN CSET_TOKEN CTYPE_TOKEN H5T_VARIABLE_TOKEN
 %token <ival> H5T_STR_NULLTERM_TOKEN H5T_STR_NULLPAD_TOKEN H5T_STR_SPACEPAD_TOKEN 
@@ -98,7 +99,7 @@ hbool_t is_opq_tag = 0;             /*flag to lexer for opaque type tag*/
 
 %%
 start   :       { memset(arr_stack, 0, STACK_SIZE*sizeof(struct arr_info)); /*initialize here?*/ }
-        |       ddl_type  { return $<ival>$;}
+        |       ddl_type  { return $<hid>$;}
         ;
 ddl_type        :       atomic_type
                 |       compound_type
@@ -112,48 +113,48 @@ atomic_type     :       integer_type
                 |       opaque_type
                 ;
 
-integer_type    :       H5T_STD_I8BE_TOKEN  { $<ival>$ = H5Tcopy(H5T_STD_I8BE); }
-                |       H5T_STD_I8LE_TOKEN  { $<ival>$ = H5Tcopy(H5T_STD_I8LE); }
-                |       H5T_STD_I16BE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_I16BE); }
-                |       H5T_STD_I16LE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_I16LE); }
-                |       H5T_STD_I32BE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_I32BE); }
-                |       H5T_STD_I32LE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_I32LE); }
-                |       H5T_STD_I64BE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_I64BE); }
-                |       H5T_STD_I64LE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_I64LE); }
-                |       H5T_STD_U8BE_TOKEN  { $<ival>$ = H5Tcopy(H5T_STD_U8BE); }
-                |       H5T_STD_U8LE_TOKEN  { $<ival>$ = H5Tcopy(H5T_STD_U8LE); }
-                |       H5T_STD_U16BE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_U16BE); }
-                |       H5T_STD_U16LE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_U16LE); }
-                |       H5T_STD_U32BE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_U32BE); }
-                |       H5T_STD_U32LE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_U32LE); }
-                |       H5T_STD_U64BE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_U64BE); }
-                |       H5T_STD_U64LE_TOKEN { $<ival>$ = H5Tcopy(H5T_STD_U64LE); }
-                |       H5T_NATIVE_CHAR_TOKEN   { $<ival>$ = H5Tcopy(H5T_NATIVE_CHAR); }
-                |       H5T_NATIVE_SCHAR_TOKEN  { $<ival>$ = H5Tcopy(H5T_NATIVE_SCHAR); }
-                |       H5T_NATIVE_UCHAR_TOKEN  { $<ival>$ = H5Tcopy(H5T_NATIVE_UCHAR); }
-                |       H5T_NATIVE_SHORT_TOKEN  { $<ival>$ = H5Tcopy(H5T_NATIVE_SHORT); }
-                |       H5T_NATIVE_USHORT_TOKEN { $<ival>$ = H5Tcopy(H5T_NATIVE_USHORT); }
-                |       H5T_NATIVE_INT_TOKEN    { $<ival>$ = H5Tcopy(H5T_NATIVE_INT); }
-                |       H5T_NATIVE_UINT_TOKEN   { $<ival>$ = H5Tcopy(H5T_NATIVE_UINT); }
-                |       H5T_NATIVE_LONG_TOKEN   { $<ival>$ = H5Tcopy(H5T_NATIVE_LONG); }
-                |       H5T_NATIVE_ULONG_TOKEN  { $<ival>$ = H5Tcopy(H5T_NATIVE_ULONG); }
-                |       H5T_NATIVE_LLONG_TOKEN  { $<ival>$ = H5Tcopy(H5T_NATIVE_LLONG); }
-                |       H5T_NATIVE_ULLONG_TOKEN { $<ival>$ = H5Tcopy(H5T_NATIVE_ULLONG); }
+integer_type    :       H5T_STD_I8BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_STD_I8BE); }
+                |       H5T_STD_I8LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_STD_I8LE); }
+                |       H5T_STD_I16BE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_I16BE); }
+                |       H5T_STD_I16LE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_I16LE); }
+                |       H5T_STD_I32BE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_I32BE); }
+                |       H5T_STD_I32LE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_I32LE); }
+                |       H5T_STD_I64BE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_I64BE); }
+                |       H5T_STD_I64LE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_I64LE); }
+                |       H5T_STD_U8BE_TOKEN  { $<hid>$ = H5Tcopy(H5T_STD_U8BE); }
+                |       H5T_STD_U8LE_TOKEN  { $<hid>$ = H5Tcopy(H5T_STD_U8LE); }
+                |       H5T_STD_U16BE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_U16BE); }
+                |       H5T_STD_U16LE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_U16LE); }
+                |       H5T_STD_U32BE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_U32BE); }
+                |       H5T_STD_U32LE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_U32LE); }
+                |       H5T_STD_U64BE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_U64BE); }
+                |       H5T_STD_U64LE_TOKEN { $<hid>$ = H5Tcopy(H5T_STD_U64LE); }
+                |       H5T_NATIVE_CHAR_TOKEN   { $<hid>$ = H5Tcopy(H5T_NATIVE_CHAR); }
+                |       H5T_NATIVE_SCHAR_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_SCHAR); }
+                |       H5T_NATIVE_UCHAR_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_UCHAR); }
+                |       H5T_NATIVE_SHORT_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_SHORT); }
+                |       H5T_NATIVE_USHORT_TOKEN { $<hid>$ = H5Tcopy(H5T_NATIVE_USHORT); }
+                |       H5T_NATIVE_INT_TOKEN    { $<hid>$ = H5Tcopy(H5T_NATIVE_INT); }
+                |       H5T_NATIVE_UINT_TOKEN   { $<hid>$ = H5Tcopy(H5T_NATIVE_UINT); }
+                |       H5T_NATIVE_LONG_TOKEN   { $<hid>$ = H5Tcopy(H5T_NATIVE_LONG); }
+                |       H5T_NATIVE_ULONG_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_ULONG); }
+                |       H5T_NATIVE_LLONG_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_LLONG); }
+                |       H5T_NATIVE_ULLONG_TOKEN { $<hid>$ = H5Tcopy(H5T_NATIVE_ULLONG); }
                 ;
 
-fp_type         :       H5T_IEEE_F32BE_TOKEN { $<ival>$ = H5Tcopy(H5T_IEEE_F32BE); }
-                |       H5T_IEEE_F32LE_TOKEN { $<ival>$ = H5Tcopy(H5T_IEEE_F32LE); }
-                |       H5T_IEEE_F64BE_TOKEN { $<ival>$ = H5Tcopy(H5T_IEEE_F64BE); }
-                |       H5T_IEEE_F64LE_TOKEN { $<ival>$ = H5Tcopy(H5T_IEEE_F64LE); }
-                |       H5T_NATIVE_FLOAT_TOKEN    { $<ival>$ = H5Tcopy(H5T_NATIVE_FLOAT); }
-                |       H5T_NATIVE_DOUBLE_TOKEN   { $<ival>$ = H5Tcopy(H5T_NATIVE_DOUBLE); }
-                |       H5T_NATIVE_LDOUBLE_TOKEN  { $<ival>$ = H5Tcopy(H5T_NATIVE_LDOUBLE); }
+fp_type         :       H5T_IEEE_F32BE_TOKEN { $<hid>$ = H5Tcopy(H5T_IEEE_F32BE); }
+                |       H5T_IEEE_F32LE_TOKEN { $<hid>$ = H5Tcopy(H5T_IEEE_F32LE); }
+                |       H5T_IEEE_F64BE_TOKEN { $<hid>$ = H5Tcopy(H5T_IEEE_F64BE); }
+                |       H5T_IEEE_F64LE_TOKEN { $<hid>$ = H5Tcopy(H5T_IEEE_F64LE); }
+                |       H5T_NATIVE_FLOAT_TOKEN    { $<hid>$ = H5Tcopy(H5T_NATIVE_FLOAT); }
+                |       H5T_NATIVE_DOUBLE_TOKEN   { $<hid>$ = H5Tcopy(H5T_NATIVE_DOUBLE); }
+                |       H5T_NATIVE_LDOUBLE_TOKEN  { $<hid>$ = H5Tcopy(H5T_NATIVE_LDOUBLE); }
                 ;
 
 compound_type   :       H5T_COMPOUND_TOKEN
                             { csindex++; cmpd_stack[csindex].id = H5Tcreate(H5T_COMPOUND, 1); /*temporarily set size to 1*/ } 
                         '{' memb_list '}'     
-                            { $<ival>$ = cmpd_stack[csindex].id; 
+                            { $<hid>$ = cmpd_stack[csindex].id; 
                               cmpd_stack[csindex].id = 0;
                               cmpd_stack[csindex].first_memb = 1; 
                               csindex--;
@@ -170,28 +171,28 @@ memb_def        :       ddl_type { cmpd_stack[csindex].is_field = 1; /*notify le
 
                             /*Adjust size and insert member, consider both member size and offset.*/
                             if(cmpd_stack[csindex].first_memb) { /*reclaim the size 1 temporarily set*/
-                                new_size = H5Tget_size($<ival>1) + $<ival>6;
+                                new_size = H5Tget_size($<hid>1) + $<ival>6;
                                 H5Tset_size(dtype_id, new_size);
                                 /*member name is saved in yylval.sval by lexer*/
-                                H5Tinsert(dtype_id, $<sval>4, $<ival>6, $<ival>1);
+                                H5Tinsert(dtype_id, $<sval>4, $<ival>6, $<hid>1);
 
                                 cmpd_stack[csindex].first_memb = 0;
                             } else {
                                 origin_size = H5Tget_size(dtype_id);
                                 
                                 if($<ival>6 == 0) {
-                                    new_size = origin_size + H5Tget_size($<ival>1);
+                                    new_size = origin_size + H5Tget_size($<hid>1);
                                     H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, $<sval>4, origin_size, $<ival>1);
+                                    H5Tinsert(dtype_id, $<sval>4, origin_size, $<hid>1);
                                 } else {
-                                    new_size = $<ival>6 + H5Tget_size($<ival>1);
+                                    new_size = $<ival>6 + H5Tget_size($<hid>1);
                                     H5Tset_size(dtype_id, new_size);
-                                    H5Tinsert(dtype_id, $<sval>4, $<ival>6, $<ival>1);
+                                    H5Tinsert(dtype_id, $<sval>4, $<ival>6, $<hid>1);
                                 }
                             }
                           
                             cmpd_stack[csindex].is_field = 0;
-                            H5Tclose($<ival>1);
+                            H5Tclose($<hid>1);
                              
                             new_size = H5Tget_size(dtype_id);
                         }
@@ -211,10 +212,10 @@ offset          :       NUMBER
 array_type      :       H5T_ARRAY_TOKEN { asindex++; /*pushd onto the stack*/ }
                         '{' dim_list ddl_type '}'
                         { 
-                          $<ival>$ = H5Tarray_create2($<ival>5, arr_stack[asindex].ndims, arr_stack[asindex].dims);
+                          $<hid>$ = H5Tarray_create2($<hid>5, arr_stack[asindex].ndims, arr_stack[asindex].dims);
                           arr_stack[asindex].ndims = 0;
                           asindex--;
-                          H5Tclose($<ival>5);
+                          H5Tclose($<hid>5);
                         }            
                 ;
 dim_list        :
@@ -232,7 +233,7 @@ dimsize         :       NUMBER
                 ;
 
 vlen_type       :       H5T_VLEN_TOKEN '{' ddl_type '}'
-                            { $<ival>$ = H5Tvlen_create($<ival>3); H5Tclose($<ival>3); }
+                            { $<hid>$ = H5Tvlen_create($<hid>3); H5Tclose($<hid>3); }
                 ;
 
 opaque_type     :       H5T_OPAQUE_TOKEN
@@ -240,15 +241,15 @@ opaque_type     :       H5T_OPAQUE_TOKEN
                             OPQ_SIZE_TOKEN { is_opq_size = 1; } opaque_size ';'
                             {   
                                 size_t size = (size_t)yylval.ival;
-                                $<ival>$ = H5Tcreate(H5T_OPAQUE, size);
+                                $<hid>$ = H5Tcreate(H5T_OPAQUE, size);
                                 is_opq_size = 0;    
                             }
                             OPQ_TAG_TOKEN { is_opq_tag = 1; } '"' opaque_tag '"' ';'
                             {  
-                                H5Tset_tag($<ival>7, yylval.sval);
+                                H5Tset_tag($<hid>7, yylval.sval);
                                 is_opq_tag = 0;
                             }                             
-                        '}' { $<ival>$ = $<ival>7; }
+                        '}' { $<hid>$ = $<hid>7; }
                 ;
 opaque_size     :       NUMBER
                 ;
@@ -282,14 +283,14 @@ string_type     :       H5T_STRING_TOKEN
                             }
                             CTYPE_TOKEN ctype ';'
                             {
-                                if($<ival>17 == H5T_C_S1_TOKEN)
-                                    $<ival>$ = H5Tcopy(H5T_C_S1);
-                                else if($<ival>17 == H5T_FORTRAN_S1_TOKEN)
-                                    $<ival>$ = H5Tcopy(H5T_FORTRAN_S1);
+                                if($<hid>17 == H5T_C_S1_TOKEN)
+                                    $<hid>$ = H5Tcopy(H5T_C_S1);
+                                else if($<hid>17 == H5T_FORTRAN_S1_TOKEN)
+                                    $<hid>$ = H5Tcopy(H5T_FORTRAN_S1);
                             }
                         '}' 
                             {   
-                                hid_t str_id = $<ival>19;
+                                hid_t str_id = $<hid>19;
 
                                 /*set string size*/
                                 if(is_variable) {
@@ -302,7 +303,7 @@ string_type     :       H5T_STRING_TOKEN
                                 H5Tset_strpad(str_id, str_pad);
                                 H5Tset_cset(str_id, str_cset);
 
-                                $<ival>$ = str_id; 
+                                $<hid>$ = str_id; 
                             }
                 ;
 strsize         :       H5T_VARIABLE_TOKEN     {$<ival>$ = H5T_VARIABLE_TOKEN;}
@@ -315,14 +316,14 @@ strpad          :       H5T_STR_NULLTERM_TOKEN {$<ival>$ = H5T_STR_NULLTERM_TOKE
 cset            :       H5T_CSET_ASCII_TOKEN {$<ival>$ = H5T_CSET_ASCII_TOKEN;}
                 |       H5T_CSET_UTF8_TOKEN {$<ival>$ = H5T_CSET_UTF8_TOKEN;}
                 ;
-ctype           :       H5T_C_S1_TOKEN         {$<ival>$ = H5T_C_S1_TOKEN;}
-                |       H5T_FORTRAN_S1_TOKEN   {$<ival>$ = H5T_FORTRAN_S1_TOKEN;}
+ctype           :       H5T_C_S1_TOKEN         {$<hid>$ = H5T_C_S1_TOKEN;}
+                |       H5T_FORTRAN_S1_TOKEN   {$<hid>$ = H5T_FORTRAN_S1_TOKEN;}
                 ;
 
 enum_type       :       H5T_ENUM_TOKEN '{' integer_type ';' 
-                            { is_enum = 1; enum_id = H5Tenum_create($<ival>3); H5Tclose($<ival>3); }
+                            { is_enum = 1; enum_id = H5Tenum_create($<hid>3); H5Tclose($<hid>3); }
                         enum_list '}'
-                            { is_enum = 0; /*reset*/ $<ival>$ = enum_id; }
+                            { is_enum = 0; /*reset*/ $<hid>$ = enum_id; }
                 ;
 enum_list       :
                 |       enum_list enum_def
diff --git a/hl/src/H5LTprivate.h b/hl/src/H5LTprivate.h
index 0ee6b5c..98ac06e 100644
--- a/hl/src/H5LTprivate.h
+++ b/hl/src/H5LTprivate.h
@@ -48,6 +48,6 @@ H5_HLDLL herr_t  H5LT_find_attribute( hid_t loc_id, const char *name );
 H5_HLDLL char* H5LT_dtype_to_text(hid_t dtype, char *dt_str, H5LT_lang_t lang,
                                     size_t *slen, hbool_t no_user_buf);
 
-H5_HLDLL int H5LTyyparse(void);
+H5_HLDLL hid_t H5LTyyparse(void);
 
 #endif
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index 2ed379a..a1456ea 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -3263,7 +3263,7 @@ hid_t H5TB_create_type(hid_t loc_id,
     hsize_t  nfields = 0;
     char   **fnames = NULL;
     unsigned i;
-    herr_t   ret_val = -1;
+    hid_t   ret_val = -1;
 
     /* get the number of fields  */
     if(H5TBget_table_info(loc_id, dset_name, &nfields, NULL) < 0)
diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index 08d1c46..bddd162 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -1016,13 +1016,13 @@ test_invalid_parameters(hid_t file)
 
     /* Check invalid dataset ID */ 
     H5E_BEGIN_TRY {
-        if((status = H5DOwrite_chunk(-1, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
+        if((status = H5DOwrite_chunk((hid_t)-1, dxpl, filter_mask, offset, buf_size, direct_buf)) != FAIL)
             goto error;
     } H5E_END_TRY;
 
     /* Check invalid DXPL ID */
     H5E_BEGIN_TRY {
-        if((status = H5DOwrite_chunk(dataset, -1, filter_mask, offset, buf_size, direct_buf)) != FAIL)
+        if((status = H5DOwrite_chunk(dataset, (hid_t)-1, filter_mask, offset, buf_size, direct_buf)) != FAIL)
             goto error;
     } H5E_END_TRY;