[svn-r16566] Description:

    Bring r16560 back from trunk.

Tested on:
    Mac OS X/32 10.5.6 (amazon) debug & production
    (Following up with tests on more platforms)

3 files changed, 8 insertions, 8 deletions

diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index 7886aeb..e8a24b8 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -224,7 +224,7 @@ static void soft_link_example(void)
     const H5L_class_t UD_soft_class[1] = {{
         H5L_LINK_CLASS_T_VERS,      /* Version number for this struct.
                                      * This field is always H5L_LINK_CLASS_T_VERS */
-        UD_SOFT_CLASS,              /* Link class id number. This can be any
+        (H5L_type_t)UD_SOFT_CLASS,  /* Link class id number. This can be any
                                      * value between H5L_TYPE_UD_MIN (64) and
                                      * H5L_TYPE_MAX (255). It should be a
                                      * value that isn't already being used by
@@ -258,7 +258,7 @@ static void soft_link_example(void)
     /* Now create a user-defined link.  We give it the path to the group
      * as its udata.1
      */
-    H5Lcreate_ud(file_id, UD_SOFT_LINK_NAME, UD_SOFT_CLASS, TARGET_GROUP,
+    H5Lcreate_ud(file_id, UD_SOFT_LINK_NAME, (H5L_type_t)UD_SOFT_CLASS, TARGET_GROUP,
                  strlen(TARGET_GROUP) + 1, H5P_DEFAULT, H5P_DEFAULT);
 
     /* We can access the group through the UD soft link like we would through
@@ -327,7 +327,7 @@ static void hard_link_example(void)
     const H5L_class_t UD_hard_class[1] = {{
         H5L_LINK_CLASS_T_VERS,      /* Version number for this struct.
                                      * This field is always H5L_LINK_CLASS_T_VERS */
-        UD_HARD_CLASS,              /* Link class id number. This can be any
+        (H5L_type_t)UD_HARD_CLASS,  /* Link class id number. This can be any
                                      * value between H5L_TYPE_UD_MIN (64) and
                                      * H5L_TYPE_MAX (255). It should be a
                                      * value that isn't already being used by
@@ -368,7 +368,7 @@ static void hard_link_example(void)
     /* Now create a user-defined link.  We give it the group's address
      * as its udata.
      */
-    H5Lcreate_ud(file_id, UD_HARD_LINK_NAME, UD_HARD_CLASS, &(li.u.address),
+    H5Lcreate_ud(file_id, UD_HARD_LINK_NAME, (H5L_type_t)UD_HARD_CLASS, &(li.u.address),
                  sizeof(li.u.address), H5P_DEFAULT, H5P_DEFAULT);
 
     /* The UD hard link has now incremented the group's reference count
@@ -546,7 +546,7 @@ static void plist_link_example(void)
     const H5L_class_t UD_plist_class[1] = {{
         H5L_LINK_CLASS_T_VERS,      /* Version number for this struct.
                                      * This field is always H5L_LINK_CLASS_T_VERS */
-        UD_PLIST_CLASS,             /* Link class id number. This can be any
+        (H5L_type_t)UD_PLIST_CLASS, /* Link class id number. This can be any
                                      * value between H5L_TYPE_UD_MIN (64) and
                                      * H5L_TYPE_MAX (255). It should be a
                                      * value that isn't already being used by
@@ -572,7 +572,7 @@ static void plist_link_example(void)
 
     /* Register "plist links" and create one.  It has no udata at all. */
     H5Lregister(UD_plist_class);
-    H5Lcreate_ud(file_id, "plist_link", UD_PLIST_CLASS, NULL, 0,
+    H5Lcreate_ud(file_id, "plist_link", (H5L_type_t)UD_PLIST_CLASS, NULL, 0,
                  H5P_DEFAULT, H5P_DEFAULT);
 
     /* Create a group access property list to pass in the target for the
diff --git a/examples/h5_ref2reg.c b/examples/h5_ref2reg.c
index d6df438..17ec724 100644
--- a/examples/h5_ref2reg.c
+++ b/examples/h5_ref2reg.c
@@ -97,7 +97,7 @@ int main(void)
      * Create a reference to elements selection.
      */
     status = H5Sselect_none(space_id);
-    status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, coord);
+    status = H5Sselect_elements(space_id, H5S_SELECT_SET, num_points, (const hsize_t *)coord);
     status = H5Rcreate(&ref[1], file_id, dsetnamev, H5R_DATASET_REGION, space_id);
 
     /*
diff --git a/examples/h5_select.c b/examples/h5_select.c
index 595a1b3..ceb9c2c 100644
--- a/examples/h5_select.c
+++ b/examples/h5_select.c
@@ -171,7 +171,7 @@ main (void)
     coord[2][0] = 3; coord[2][1] = 5;
     coord[3][0] = 5; coord[3][1] = 6;
 
-    ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, coord);
+    ret = H5Sselect_elements(fid, H5S_SELECT_SET, NPOINTS, (const hsize_t *)coord);
 
     /*
      * Write new selection of points to the dataset.