[svn-r30285] Description:

    More warning cleanups, bringing the build down to 25 unique types of
warnings, with 550 warnings in 122 files (down from 28, 770, and 134).

Tested on:
    MacOSX/64 10.11.5 (amazon) w/serial & parallel
    (h5committest forthcoming)

1 files changed, 4 insertions, 11 deletions

diff --git a/test/flush2.c b/test/flush2.c
index e86d646..7dc45be 100644
--- a/test/flush2.c
+++ b/test/flush2.c
@@ -63,22 +63,15 @@ check_dset(hid_t file, const char* name)
     assert(100 == ds_size[0] && 100 == ds_size[1]);
 
     /* Read some data */
-    if(H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT,
-		the_data) < 0) goto error;
+    if(H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT, the_data) < 0) goto error;
     for(i = 0; i < (size_t)ds_size[0]; i++)
 	for(j = 0; j < (size_t)ds_size[1]; j++) {
-	    /*
-	     * The extra cast in the following statement is a bug workaround
-	     * for the Win32 version 5.0 compiler.
-	     * 1998-11-06 ptl
-	     */
-	    error = fabs(the_data[i][j] - (double)(hssize_t)i / ((hssize_t)j + 1));
-	    if(error > 0.0001F) {
+	    error = HDfabs(the_data[i][j] - (double)i / (double)(j + 1));
+	    if(error > (double)0.0001F) {
 		    H5_FAILED();
 		    printf("    dset[%lu][%lu] = %g\n",
 			    (unsigned long)i, (unsigned long)j, the_data[i][j]);
-		    printf("    should be %g\n",
-			    (double)(hssize_t)i/(hssize_t)(j+1));
+		    printf("    should be %g\n", (double)i / (double)(j + 1));
 		    goto error;
 	    }
 	}