From 6447935a194eab5e28996ce1a7f9224734a41346 Mon Sep 17 00:00:00 2001
From: Jonathan Kim <jkm@hdfgroup.org>
Date: Thu, 3 Jun 2010 14:34:20 -0500
Subject: [svn-r18958] Purpose: Fixed Windows compile error. Renamed to use
 'gid1' and 'gid2' instead of 'grp1' and 'grp2'. Description: There is
 variable name confliction with 'grp1' ~ 'grp9' in Windows system. It occurs
 if H5private.h is included in the code.

---
 tools/h5dump/h5dumpgentest.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c
index 531cdcd..dd01d5b 100644
--- a/tools/h5dump/h5dumpgentest.c
+++ b/tools/h5dump/h5dumpgentest.c
@@ -483,7 +483,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;   
@@ -507,16 +507,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;
@@ -649,7 +649,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);
@@ -658,7 +658,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);
@@ -667,7 +667,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);
@@ -676,7 +676,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);
@@ -685,7 +685,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);
@@ -698,8 +698,8 @@ out:
      * Close/release resources.
      */
     H5Sclose(dataspace);
-    H5Gclose(grp1);
-    H5Gclose(grp2);
+    H5Gclose(gid1);
+    H5Gclose(gid2);
     H5Tclose(datatype);
     H5Dclose(dset1);
     H5Dclose(dset2);
-- 
cgit v0.12