diff options
author | Jonathan Kim <jkm@hdfgroup.org> | 2010-06-03 20:27:24 (GMT) |
---|---|---|
committer | Jonathan Kim <jkm@hdfgroup.org> | 2010-06-03 20:27:24 (GMT) |
commit | d8947d73704c8128eeb857c7401ac5ed9081a10a (patch) | |
tree | 3bbfca324c3e0e1be617a40271adc291b4d4cd58 | |
parent | ddec11ecb0ab7b6f50a17fbbb0fcaa6a2a2b57e8 (diff) | |
download | hdf5-d8947d73704c8128eeb857c7401ac5ed9081a10a.zip hdf5-d8947d73704c8128eeb857c7401ac5ed9081a10a.tar.gz hdf5-d8947d73704c8128eeb857c7401ac5ed9081a10a.tar.bz2 |
[svn-r18961] Purpose:
Fixed Windows compile error. Renamed to use 'gid1' and 'gid2' instead of
'grp1' and 'grp2'.
Description:
This is related SVN r18946.
There is variable name confliction with 'grp1' ~ 'grp9' in Windows system.
It occurs if H5private.h is included in the code.
-rw-r--r-- | tools/h5dump/h5dumpgentest.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index 7f6fc3b..a1ba7d3 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -487,7 +487,7 @@ static void gent_softlink(void) static int gent_softlink2(void) { hid_t fileid1; - hid_t grp1=0, grp2=0; + hid_t gid1=0, gid2=0; hid_t tid; hid_t dset1, dset2; hid_t datatype, dataspace; @@ -511,16 +511,16 @@ static int gent_softlink2(void) /*----------------------------------------------------------------------- * Groups *------------------------------------------------------------------------*/ - grp1 = H5Gcreate2(fileid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - if (grp1 < 0) + gid1 = H5Gcreate2(fileid1, "group1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + if (gid1 < 0) { fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1); status = FAIL; goto out; } - grp2 = H5Gcreate2(fileid1, "group_empty", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); - if (grp2 < 0) + gid2 = H5Gcreate2(fileid1, "group_empty", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT); + if (gid2 < 0) { fprintf(stderr, "Error: %s> H5Gcreate2 failed.\n", FILE4_1); status = FAIL; @@ -653,7 +653,7 @@ static int gent_softlink2(void) * create various soft links under a group */ /* link to dset1 */ - status = H5Lcreate_soft("/dset1", grp1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT); + status = H5Lcreate_soft("/dset1", gid1, "soft_dset1", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); @@ -662,7 +662,7 @@ static int gent_softlink2(void) } /* link to dset2 */ - status = H5Lcreate_soft("/dset2", grp1, "soft_dset2", H5P_DEFAULT, H5P_DEFAULT); + status = H5Lcreate_soft("/dset2", gid1, "soft_dset2", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); @@ -671,7 +671,7 @@ static int gent_softlink2(void) } /* link to data type */ - status = H5Lcreate_soft("/dtype", grp1, "soft_dtype", H5P_DEFAULT, H5P_DEFAULT); + status = H5Lcreate_soft("/dtype", gid1, "soft_dtype", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); @@ -680,7 +680,7 @@ static int gent_softlink2(void) } /* link to empty group */ - status = H5Lcreate_soft("/group_empty", grp1, "soft_empty_grp", H5P_DEFAULT, H5P_DEFAULT); + status = H5Lcreate_soft("/group_empty", gid1, "soft_empty_grp", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); @@ -689,7 +689,7 @@ static int gent_softlink2(void) } /* dangling link */ - status = H5Lcreate_soft("not_yet", grp1, "soft_dangle", H5P_DEFAULT, H5P_DEFAULT); + status = H5Lcreate_soft("not_yet", gid1, "soft_dangle", H5P_DEFAULT, H5P_DEFAULT); if (status < 0) { fprintf(stderr, "Error: %s> H5Lcreate_soft failed.\n", FILE4_1); @@ -702,8 +702,8 @@ out: * Close/release resources. */ H5Sclose(dataspace); - H5Gclose(grp1); - H5Gclose(grp2); + H5Gclose(gid1); + H5Gclose(gid2); H5Tclose(datatype); H5Dclose(dset1); H5Dclose(dset2); |