Merge pull request #2509 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit 'ef70c1695d0cccb4ba379abe3969ac2fec0d4ebe':
  Fix shadowed type

hl/c++/test/ptableTest.cpp

@@ -142,7 +142,7 @@ int TestCompoundDatatype()
     HDfflush(stdout);
 
     /* Create compound datatype */
-    typedef struct compoundType
+    typedef struct
     {
         short a, b, c;
         int e;
@@ -479,7 +479,7 @@ int SystemTest()
 
     /* Creating two inter-related datatypes.  Create two datasets and put
      * one datatype in each. */
-    typedef struct compoundType
+    typedef struct
     {
         short a, b, c;
         int e;
@@ -492,7 +492,7 @@ int SystemTest()
     H5Tinsert(dtypeID1, "charlie", HOFFSET( compoundType, c ), H5T_NATIVE_SHORT);
     H5Tinsert(dtypeID1, "ebert", HOFFSET( compoundType, e ), H5T_NATIVE_INT);
 
-    typedef struct cType2
+    typedef struct
     {
         char f;
         compoundType g;