[svn-r324] Change H5A (atoms) to H5I (IDs)

1 files changed, 19 insertions, 19 deletions

diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index beae526..02b7db3 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -9,7 +9,7 @@
  */
 #define H5T_PACKAGE             /*suppress error about including H5Tpkg   */
 
-#include <H5Aprivate.h>
+#include <H5Iprivate.h>
 #include <H5Eprivate.h>
 #include <H5MMprivate.h>
 #include <H5Tpkg.h>
@@ -111,10 +111,10 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
     switch (cdata->command) {
     case H5T_CONV_INIT:
         /* Capability query */
-	if (H5_DATATYPE != H5A_group(src_id) ||
-	    NULL == (src = H5A_object(src_id)) ||
-	    H5_DATATYPE != H5A_group(dst_id) ||
-	    NULL == (dst = H5A_object(dst_id))) {
+	if (H5_DATATYPE != H5I_group(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5_DATATYPE != H5I_group(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 	}
         if (src->size != dst->size ||
@@ -154,10 +154,10 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 
     case H5T_CONV_CONV:
 	/* The conversion */
-	if (H5_DATATYPE != H5A_group(src_id) ||
-	    NULL == (src = H5A_object(src_id)) ||
-	    H5_DATATYPE != H5A_group(dst_id) ||
-	    NULL == (dst = H5A_object(dst_id))) {
+	if (H5_DATATYPE != H5I_group(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5_DATATYPE != H5I_group(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 	}
 	md = src->size / 2;
@@ -255,12 +255,12 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
 	    }
 	    if (priv->src2dst[i]>=0) {
 		type = H5T_copy (src->u.compnd.memb[i].type);
-		tid = H5A_register (H5_DATATYPE, type);
+		tid = H5I_register (H5_DATATYPE, type);
 		assert (tid>=0);
 		priv->src_memb_id[priv->src2dst[i]] = tid;
 
 		type = H5T_copy (dst->u.compnd.memb[priv->src2dst[i]].type);
-		tid = H5A_register (H5_DATATYPE, type);
+		tid = H5I_register (H5_DATATYPE, type);
 		assert (tid>=0);
 		priv->dst_memb_id[priv->src2dst[i]] = tid;
 	    }
@@ -357,10 +357,10 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 	 * otherwise initialize the `priv' field of `cdata' with information
 	 * that remains (almost) constant for this conversion path.
 	 */
-	if (H5_DATATYPE != H5A_group(src_id) ||
-	    NULL == (src = H5A_object(src_id)) ||
-	    H5_DATATYPE != H5A_group(dst_id) ||
-	    NULL == (dst = H5A_object(dst_id))) {
+	if (H5_DATATYPE != H5I_group(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5_DATATYPE != H5I_group(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 	}
 	assert (H5T_COMPOUND==src->type);
@@ -412,10 +412,10 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
 	/*
 	 * Conversion.
 	 */
-	if (H5_DATATYPE != H5A_group(src_id) ||
-	    NULL == (src = H5A_object(src_id)) ||
-	    H5_DATATYPE != H5A_group(dst_id) ||
-	    NULL == (dst = H5A_object(dst_id))) {
+	if (H5_DATATYPE != H5I_group(src_id) ||
+	    NULL == (src = H5I_object(src_id)) ||
+	    H5_DATATYPE != H5I_group(dst_id) ||
+	    NULL == (dst = H5I_object(dst_id))) {
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type");
 	}
 	assert (priv);