[svn-r7662] Purpose:

    Refactor integer conversion macros

Description:
    Turned integer conversion macros "inside" out, using an interlocking
macro technique similar to templates in C++.  The macro which actually performs
the conversion is now invoked "genericly" from inside another macro, which
will allow the inner conversion loop to be optimized in a much easier way.

    This "psuedo-template" technique could be useful for other semi-repetitious
patterns in the library - possibly the datatype initialization code...

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    h5committest

2 files changed, 225 insertions, 194 deletions

diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 47f96ba..278917c 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -121,9 +121,9 @@ H5FL_BLK_DEFINE_STATIC(array_seq);
  * CDATA:	A pointer to the H5T_cdata_t structure that was passed to the
  *		conversion function.
  *
- * S_ID:	The hid_t value for the source data type.
+ * STYPE:	The hid_t value for the source data type.
  *
- * D_ID:	The hid_t value for the destination data type.
+ * DTYPE:	The hid_t value for the destination data type.
  *
  * BUF:		A pointer to the conversion buffer.
  *
@@ -142,146 +142,172 @@ H5FL_BLK_DEFINE_STATIC(array_seq);
  * D_MAX:	The maximum possible destination value. Source values which
  *		are larger than D_MAX generate overflows.
  * 
+ * The macros are implemented with a generic programming technique, similar
+ * to templates in C++.  The macro which defines the "core" part of the
+ * conversion (which actually moves the data from the source to the destination)
+ * is invoked inside the H5T_CONV "template" macro by "gluing" it together,
+ * which allows the core conversion macro to be invoked as necessary.
+ * 
  */
-#define H5T_CONV_sS(S_ALIGN,D_ALIGN,ST,DT) {				      \
+#define H5T_CONV_sS_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    *((DT*)d) = (DT)(*((ST*)s));					      \
+}
+
+#define H5T_CONV_sS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)<=sizeof(DT));					      \
-    CI_BEGIN(S_ALIGN, D_ALIGN, ST, DT, nelmts-1) {			      \
-	*((DT*)d) = (DT)(*((ST*)s));					      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_sS, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, nelmts-1)	      \
 }
 
-#define H5T_CONV_sU(STYPE,DTYPE,ST,DT) {				      \
+#define H5T_CONV_sU_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s)<0) {							      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = 0;						      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
+}
+
+#define H5T_CONV_sU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)<=sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, nelmts-1) {				      \
-	if (*((ST*)s)<0) {						      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = 0;						      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_sU, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, nelmts-1)	      \
+}
+
+#define H5T_CONV_uS_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s) > (D_MAX)) {						      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = (D_MAX);					      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
 }
 
-#define H5T_CONV_uS(STYPE,DTYPE,ST,DT,D_MAX) {				      \
+#define H5T_CONV_uS(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)<=sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, nelmts-1) {				      \
-	if (*((ST*)s) > (D_MAX)) {					      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = (D_MAX);					      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_uS, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, nelmts-1)	      \
 }
 
-#define H5T_CONV_uU(STYPE,DTYPE,ST,DT) {				      \
+#define H5T_CONV_uU_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
+    *((DT*)d) = (DT)(*((ST*)s));					      \
+}
+
+#define H5T_CONV_uU(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)<=sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, nelmts-1) {				      \
-	*((DT*)d) = (DT)(*((ST*)s));					      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_uU, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, nelmts-1)	      \
+}
+
+#define H5T_CONV_Ss_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s) > (DT)(D_MAX)) {					      \
+        if (!H5T_overflow_g ||						      \
+    	(H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+    	*((DT*)d) = (D_MAX);						      \
+        }								      \
+    } else if (*((ST*)s) < (D_MIN)) {					      \
+        if (!H5T_overflow_g ||						      \
+    	(H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+    	*((DT*)d) = (D_MIN);						      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
 }
 
 #define H5T_CONV_Ss(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)>=sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, 0) {					      \
-	if (*((ST*)s) > (DT)(D_MAX)) {					      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = (D_MAX);					      \
-	    }								      \
-	} else if (*((ST*)s) < (D_MIN)) {				      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = (D_MIN);					      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_Ss, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, 0)	      \
+}
+
+#define H5T_CONV_Su_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s) < 0) {						      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = 0;						      \
+        }								      \
+    } else if (sizeof(ST)>sizeof(DT) && *((ST*)s)>(ST)(D_MAX)) {	      \
+        /*sign vs. unsign ok in previous line*/				      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = (D_MAX);					      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
 }
 
-#define H5T_CONV_Su(STYPE,DTYPE,ST,DT,D_MAX) {				      \
+#define H5T_CONV_Su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)>=sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, 0) {					      \
-	if (*((ST*)s) < 0) {						      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = 0;						      \
-	    }								      \
-	} else if (sizeof(ST)>sizeof(DT) && *((ST*)s)>(ST)(D_MAX)) {	      \
-	    /*sign vs. unsign ok in previous line*/			      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = (D_MAX);					      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_Su, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, 0)	      \
 }
 
-#define H5T_CONV_Us(STYPE,DTYPE,ST,DT,D_MAX) {				      \
+#define H5T_CONV_Us_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s) > (D_MAX)) {						      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = (D_MAX);					      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
+}
+
+#define H5T_CONV_Us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)>=sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, 0) {					      \
-	if (*((ST*)s) > (D_MAX)) {					      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = (D_MAX);					      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_Us, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, 0)	      \
+}
+
+#define H5T_CONV_Uu_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s) > (D_MAX)) {						      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = (D_MAX);					      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
 }
 
-#define H5T_CONV_Uu(STYPE,DTYPE,ST,DT,D_MAX) {				      \
+#define H5T_CONV_Uu(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)>=sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, 0) {					      \
-	if (*((ST*)s) > (D_MAX)) {					      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = (D_MAX);					      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_Uu, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, 0)	      \
 }
 
-#define H5T_CONV_su(STYPE,DTYPE,ST,DT) {				      \
+#define H5T_CONV_su_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s) < 0) {						      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = 0;						      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
+}
+
+#define H5T_CONV_su(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)==sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, 0) {					      \
-	if (*((ST*)s) < 0) {						      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = 0;						      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_su, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, 0)	      \
+}
+
+#define H5T_CONV_us_CORE(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {		      \
+    if (*((ST*)s) > (D_MAX)) {						      \
+        if (!H5T_overflow_g ||						      \
+            (H5T_overflow_g)(src_id, dst_id, s, d)<0) {			      \
+            *((DT*)d) = (D_MAX);					      \
+        }								      \
+    } else {								      \
+        *((DT*)d) = (DT)(*((ST*)s));					      \
+    }									      \
 }
 
-#define H5T_CONV_us(STYPE,DTYPE,ST,DT,D_MAX) {				      \
+#define H5T_CONV_us(STYPE,DTYPE,ST,DT,D_MIN,D_MAX) {			      \
     assert(sizeof(ST)==sizeof(DT));					      \
-    CI_BEGIN(STYPE, DTYPE, ST, DT, 0) {					      \
-	if (*((ST*)s) > (D_MAX)) {					      \
-	    if (!H5T_overflow_g ||					      \
-		(H5T_overflow_g)(src_id, dst_id, s, d)<0) {		      \
-		*((DT*)d) = (D_MAX);					      \
-	    }								      \
-	} else {							      \
-	    *((DT*)d) = (DT)(*((ST*)s));				      \
-	}								      \
-    } CI_END;								      \
+    H5T_CONV(H5T_CONV_us, STYPE, DTYPE, ST, DT, D_MIN, D_MAX, 0)	      \
 }
 
-/* The first part of every integer hardware conversion macro */
-#define CI_BEGIN(STYPE,DTYPE,ST,DT,STRT) {				      \
+/* The main part of every integer hardware conversion macro */
+#define H5T_CONV(GUTS,STYPE,DTYPE,ST,DT,D_MIN,D_MAX,STRT) {		      \
     hsize_t	elmtno;			/*element number		*/    \
     void	*src, *s;		/*source buffer			*/    \
     void	*dst, *d;		/*destination buffer		*/    \
@@ -342,8 +368,8 @@ H5FL_BLK_DEFINE_STATIC(array_seq);
                ((size_t)buf%H5T_NATIVE_##DTYPE##_ALIGN_g ||		      \
      /* Cray */ ((size_t)((DT*)buf)!=(size_t)buf) ||			      \
                 d_stride%H5T_NATIVE_##DTYPE##_ALIGN_g);			      \
-    CI_INC_SRC(s_mv)                                     \
-    CI_INC_DST(d_mv)                                     \
+	CI_INC_SRC(s_mv)						      \
+	CI_INC_DST(d_mv)						      \
 									      \
 	for (elmtno=0; elmtno<nelmts; elmtno++) {			      \
 	    /* Alignment */						      \
@@ -358,8 +384,10 @@ H5FL_BLK_DEFINE_STATIC(array_seq);
 	    } else {							      \
 		d = dst;						      \
 	    }								      \
-	    /* ... user-defined stuff here -- the conversion ... */
-#define CI_END								      \
+									      \
+	    /* ... user-defined stuff here -- the conversion ... */	      \
+            H5_GLUE(GUTS,_CORE)(STYPE,DTYPE,ST,DT,D_MIN,D_MAX)		      \
+									      \
 	    /* Copy destination to final location */			      \
             if (d_mv) HDmemcpy(dst, &aligned, dt_size);			      \
 									      \
@@ -3568,7 +3596,7 @@ H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_uchar, FAIL);
 
-    H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char);
+    H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3601,7 +3629,7 @@ H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_schar, FAIL);
 
-    H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, SCHAR_MAX);
+    H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, -, SCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3634,7 +3662,7 @@ H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_short, FAIL);
 
-    H5T_CONV_sS(SCHAR, SHORT, signed char, short);
+    H5T_CONV_sS(SCHAR, SHORT, signed char, short, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3667,7 +3695,7 @@ H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_ushort, FAIL);
 
-    H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short);
+    H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3700,7 +3728,7 @@ H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_short, FAIL);
 
-    H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, SHRT_MAX);
+    H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, -, SHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3733,7 +3761,7 @@ H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_ushort, FAIL);
 
-    H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short);
+    H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3765,7 +3793,7 @@ H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_int, FAIL);
 
-    H5T_CONV_sS(SCHAR, INT, signed char, int);
+    H5T_CONV_sS(SCHAR, INT, signed char, int, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3797,7 +3825,7 @@ H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_uint, FAIL);
 
-    H5T_CONV_sU(SCHAR, UINT, signed char, unsigned);
+    H5T_CONV_sU(SCHAR, UINT, signed char, unsigned, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3829,7 +3857,7 @@ H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_int, FAIL);
 
-    H5T_CONV_uS(UCHAR, INT, unsigned char, int, INT_MAX);
+    H5T_CONV_uS(UCHAR, INT, unsigned char, int, -, INT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3861,7 +3889,7 @@ H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_uint, FAIL);
 
-    H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned);
+    H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3893,7 +3921,7 @@ H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_long, FAIL);
 
-    H5T_CONV_sS(SCHAR, LONG, signed char, long);
+    H5T_CONV_sS(SCHAR, LONG, signed char, long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3926,7 +3954,7 @@ H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_ulong, FAIL);
 
-    H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long);
+    H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3958,7 +3986,7 @@ H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_long, FAIL);
 
-    H5T_CONV_uS(UCHAR, LONG, unsigned char, long, LONG_MAX);
+    H5T_CONV_uS(UCHAR, LONG, unsigned char, long, -, LONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -3991,7 +4019,7 @@ H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_ulong, FAIL);
 
-    H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long);
+    H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4024,7 +4052,7 @@ H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_llong, FAIL);
 
-    H5T_CONV_sS(SCHAR, LLONG, signed char, long_long);
+    H5T_CONV_sS(SCHAR, LLONG, signed char, long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4057,7 +4085,7 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_schar_ullong, FAIL);
 
-    H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long);
+    H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4090,7 +4118,7 @@ H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_llong, FAIL);
 
-    H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, LLONG_MAX);
+    H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, -, LLONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4123,7 +4151,7 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uchar_ullong, FAIL);
 
-    H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long);
+    H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4189,7 +4217,7 @@ H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_uchar, FAIL);
 
-    H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, UCHAR_MAX);
+    H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4222,7 +4250,7 @@ H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_schar, FAIL);
     
-    H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, SCHAR_MAX);
+    H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, -, SCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4255,7 +4283,7 @@ H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_uchar, FAIL);
 
-    H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, UCHAR_MAX);
+    H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4288,7 +4316,7 @@ H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_ushort, FAIL);
     
-    H5T_CONV_su(SHORT, USHORT, short, unsigned short);
+    H5T_CONV_su(SHORT, USHORT, short, unsigned short, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4321,7 +4349,7 @@ H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_short, FAIL);
 
-    H5T_CONV_us(USHORT, SHORT, unsigned short, short, SHRT_MAX);
+    H5T_CONV_us(USHORT, SHORT, unsigned short, short, -, SHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4354,7 +4382,7 @@ H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_int, FAIL);
 
-    H5T_CONV_sS(SHORT, INT, short, int);
+    H5T_CONV_sS(SHORT, INT, short, int, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4387,7 +4415,7 @@ H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_uint, FAIL);
 
-    H5T_CONV_sU(SHORT, UINT, short, unsigned);
+    H5T_CONV_sU(SHORT, UINT, short, unsigned, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4420,7 +4448,7 @@ H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_int, FAIL);
 
-    H5T_CONV_uS(USHORT, INT, unsigned short, int, INT_MAX);
+    H5T_CONV_uS(USHORT, INT, unsigned short, int, -, INT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4453,7 +4481,7 @@ H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_uint, FAIL);
 
-    H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned);
+    H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4486,7 +4514,7 @@ H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_long, FAIL);
 
-    H5T_CONV_sS(SHORT, LONG, short, long);
+    H5T_CONV_sS(SHORT, LONG, short, long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4519,7 +4547,7 @@ H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_ulong, FAIL);
 
-    H5T_CONV_sU(SHORT, ULONG, short, unsigned long);
+    H5T_CONV_sU(SHORT, ULONG, short, unsigned long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4552,7 +4580,7 @@ H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_long, FAIL);
 
-    H5T_CONV_uS(USHORT, LONG, unsigned short, long, LONG_MAX);
+    H5T_CONV_uS(USHORT, LONG, unsigned short, long, -, LONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4585,7 +4613,7 @@ H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_ulong, FAIL);
 
-    H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long);
+    H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4618,7 +4646,7 @@ H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_llong, FAIL);
 
-    H5T_CONV_sS(SHORT, LLONG, short, long_long);
+    H5T_CONV_sS(SHORT, LLONG, short, long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4651,7 +4679,7 @@ H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_short_ullong, FAIL);
 
-    H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long);
+    H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4684,7 +4712,7 @@ H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_llong, FAIL);
 
-    H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, LLONG_MAX);
+    H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, -, LLONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4717,7 +4745,7 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ushort_ullong, FAIL);
 
-    H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long);
+    H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4783,7 +4811,7 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_int_uchar, FAIL);
 
-    H5T_CONV_Su(INT, UCHAR, int, unsigned char, UCHAR_MAX);
+    H5T_CONV_Su(INT, UCHAR, int, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4816,7 +4844,7 @@ H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_schar, FAIL);
 
-    H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, SCHAR_MAX);
+    H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, -, SCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4849,7 +4877,7 @@ H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_uchar, FAIL);
     
-    H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, UCHAR_MAX);
+    H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4915,7 +4943,7 @@ H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_int_ushort, FAIL);
 
-    H5T_CONV_Su(INT, USHORT, int, unsigned short, USHRT_MAX);
+    H5T_CONV_Su(INT, USHORT, int, unsigned short, -, USHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4948,7 +4976,7 @@ H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_short, FAIL);
 
-    H5T_CONV_Us(UINT, SHORT, unsigned, short, SHRT_MAX);
+    H5T_CONV_Us(UINT, SHORT, unsigned, short, -, SHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -4981,7 +5009,7 @@ H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_ushort, FAIL);
 
-    H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, USHRT_MAX);
+    H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, -, USHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5013,7 +5041,7 @@ H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_int_uint, FAIL);
 
-    H5T_CONV_su(INT, UINT, int, unsigned);
+    H5T_CONV_su(INT, UINT, int, unsigned, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5045,7 +5073,7 @@ H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_int, FAIL);
 
-    H5T_CONV_us(UINT, INT, unsigned, int, INT_MAX);
+    H5T_CONV_us(UINT, INT, unsigned, int, -, INT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5077,7 +5105,7 @@ H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_int_long, FAIL);
 
-    H5T_CONV_sS(INT, LONG, int, long);
+    H5T_CONV_sS(INT, LONG, int, long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5109,7 +5137,7 @@ H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_int_ulong, FAIL);
 
-    H5T_CONV_sU(INT, LONG, int, unsigned long);
+    H5T_CONV_sU(INT, LONG, int, unsigned long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5141,7 +5169,7 @@ H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_long, FAIL);
 
-    H5T_CONV_uS(UINT, LONG, unsigned, long, LONG_MAX);
+    H5T_CONV_uS(UINT, LONG, unsigned, long, -, LONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5173,7 +5201,7 @@ H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_ulong, FAIL);
 
-    H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long);
+    H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5205,7 +5233,7 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_int_llong, FAIL);
 
-    H5T_CONV_sS(INT, LLONG, int, long_long);
+    H5T_CONV_sS(INT, LLONG, int, long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5237,7 +5265,7 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_int_ullong, FAIL);
 
-    H5T_CONV_sU(INT, ULLONG, int, unsigned long_long);
+    H5T_CONV_sU(INT, ULLONG, int, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5269,7 +5297,7 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_llong, FAIL);
 
-    H5T_CONV_uS(UINT, LLONG, unsigned, long_long, LLONG_MAX);
+    H5T_CONV_uS(UINT, LLONG, unsigned, long_long, -, LLONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5302,7 +5330,7 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_uint_ullong, FAIL);
 
-    H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long);
+    H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5366,7 +5394,7 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_long_uchar, FAIL);
 
-    H5T_CONV_Su(LONG, UCHAR, long, unsigned char, UCHAR_MAX);
+    H5T_CONV_Su(LONG, UCHAR, long, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5399,7 +5427,7 @@ H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_schar, FAIL);
 
-    H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, SCHAR_MAX);
+    H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, -, SCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5432,7 +5460,7 @@ H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_uchar, FAIL);
 
-    H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, UCHAR_MAX);
+    H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5497,7 +5525,7 @@ H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_long_ushort, FAIL);
 
-    H5T_CONV_Su(LONG, USHORT, long, unsigned short, USHRT_MAX);
+    H5T_CONV_Su(LONG, USHORT, long, unsigned short, -, USHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5529,7 +5557,7 @@ H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_short, FAIL);
 
-    H5T_CONV_Us(ULONG, SHORT, unsigned long, short, SHRT_MAX);
+    H5T_CONV_Us(ULONG, SHORT, unsigned long, short, -, SHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5562,7 +5590,7 @@ H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_ushort, FAIL);
 
-    H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, USHRT_MAX);
+    H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, -, USHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5626,7 +5654,7 @@ H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_long_uint, FAIL);
 
-    H5T_CONV_Su(LONG, UINT, long, unsigned, UINT_MAX);
+    H5T_CONV_Su(LONG, UINT, long, unsigned, -, UINT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5658,7 +5686,7 @@ H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_int, FAIL);
 
-    H5T_CONV_Us(ULONG, INT, unsigned long, int, INT_MAX);
+    H5T_CONV_Us(ULONG, INT, unsigned long, int, -, INT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5690,7 +5718,7 @@ H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_uint, FAIL);
 
-    H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, UINT_MAX);
+    H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, -, UINT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5722,7 +5750,7 @@ H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_long_ulong, FAIL);
 
-    H5T_CONV_su(LONG, ULONG, long, unsigned long);
+    H5T_CONV_su(LONG, ULONG, long, unsigned long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5754,7 +5782,7 @@ H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_long, FAIL);
 
-    H5T_CONV_us(ULONG, LONG, unsigned long, long, LONG_MAX);
+    H5T_CONV_us(ULONG, LONG, unsigned long, long, -, LONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5786,7 +5814,7 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL);
 
-    H5T_CONV_sS(LONG, LLONG, long, long_long);
+    H5T_CONV_sS(LONG, LLONG, long, long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5819,7 +5847,7 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_long_ullong, FAIL);
 
-    H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long);
+    H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5852,7 +5880,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL);
 
-    H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, LLONG_MAX);
+    H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, -, LLONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5885,7 +5913,7 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ulong_ullong, FAIL);
 
-    H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long);
+    H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5951,7 +5979,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_llong_uchar, FAIL);
 
-    H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, UCHAR_MAX);
+    H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -5984,7 +6012,7 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_schar, FAIL);
 
-    H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, SCHAR_MAX);
+    H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, -, SCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6017,7 +6045,7 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_uchar, FAIL);
 
-    H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, UCHAR_MAX);
+    H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, -, UCHAR_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6083,7 +6111,7 @@ H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_llong_ushort, FAIL);
 
-    H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, USHRT_MAX);
+    H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, -, USHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6116,7 +6144,7 @@ H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_short, FAIL);
 
-    H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, SHRT_MAX);
+    H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, -, SHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6149,7 +6177,7 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_ushort, FAIL);
 
-    H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, USHRT_MAX);
+    H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, -, USHRT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6213,7 +6241,7 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_llong_uint, FAIL);
 
-    H5T_CONV_Su(LLONG, UINT, long_long, unsigned, UINT_MAX);
+    H5T_CONV_Su(LLONG, UINT, long_long, unsigned, -, UINT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6245,7 +6273,7 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_int, FAIL);
 
-    H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, INT_MAX);
+    H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, -, INT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6278,7 +6306,7 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_uint, FAIL);
 
-    H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, UINT_MAX);
+    H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, -, UINT_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6343,7 +6371,7 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_llong_ulong, FAIL);
 
-    H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, ULONG_MAX);
+    H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, -, ULONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6376,7 +6404,7 @@ H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_long, FAIL);
 
-    H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, LONG_MAX);
+    H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, -, LONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6409,7 +6437,7 @@ H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_ulong, FAIL);
 
-    H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, ULONG_MAX);
+    H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, -, ULONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6442,7 +6470,7 @@ H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_llong_ullong, FAIL);
 
-    H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long);
+    H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long, -, -);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
@@ -6475,7 +6503,7 @@ H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
 
     FUNC_ENTER_NOAPI(H5T_conv_ullong_llong, FAIL);
 
-    H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, LLONG_MAX);
+    H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, -, LLONG_MAX);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
diff --git a/src/H5private.h b/src/H5private.h
index a9d8a98..a523c94 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1329,6 +1329,9 @@ extern hbool_t H5_MPEinit_g;   /* Has the MPE Library been initialized? */
 #  define PABLO_TRACE_OFF(m, f) /*void */
 #endif
 
+/* Macro for "glueing" together two items, for re-scanning macros */
+#define H5_GLUE(x,y)       x##y
+
 /* Private functions, not part of the publicly documented API */
 H5_DLL herr_t H5_init_library(void);
 H5_DLL void H5_term_library(void);