[svn-r26398] Merges r26333 from trunk

Eliminates gcc warnings due to -Wunsuffixed-float-constants.

- Adds 'F' suffixes for most float constants.

- A few constants MUST be of type double. These now receive the long
  double L suffix and are then cast to double. I do this via a new
  H5_DOUBLE() macro which was added to H5private.h.

- Additionally, some 1.8-specific float suffixes were added.

Fixes: HDFFV-9148

Tested on: h5committest

5 files changed, 32 insertions, 32 deletions

diff --git a/tools/perform/chunk.c b/tools/perform/chunk.c
index a3c11c1..6825a4c 100644
--- a/tools/perform/chunk.c
+++ b/tools/perform/chunk.c
@@ -57,20 +57,20 @@
 #define RM_CACHE_STRT	25
 #define RM_CACHE_END	25
 #define RM_CACHE_DELT	5
-#define RM_START	0.50
-#define RM_END	        5.00
-#define RM_DELTA	0.50
-#define RM_W0		0.0
+#define RM_START	0.50F
+#define RM_END	        5.00F
+#define RM_DELTA	0.50F
+#define RM_W0		0.0F
 #define RM_NRDCC	521
 
 /* Diagonal test */
 #define DIAG_CACHE_STRT	25
 #define DIAG_CACHE_END	25
 #define DIAG_CACHE_DELT	5
-#define DIAG_START	0.50
-#define DIAG_END	5.00
-#define DIAG_DELTA	0.50
-/* #define DIAG_W0		0.65 */
+#define DIAG_START	0.50F
+#define DIAG_END	5.00F
+#define DIAG_DELTA	0.50F
+/* #define DIAG_W0		0.65F */
 /* #define DIAG_NRDCC		521 */
 
 static size_t	nio_g;
diff --git a/tools/perform/iopipe.c b/tools/perform/iopipe.c
index 85063fa..a04ef82 100644
--- a/tools/perform/iopipe.c
+++ b/tools/perform/iopipe.c
@@ -81,25 +81,25 @@ print_stats (const char *prefix,
     double  u_time, s_time;
 
     u_time = ((double)(r_stop->ru_utime.tv_sec)+
-        (double)(r_stop->ru_utime.tv_usec)/1000000.0) -
+        (double)(r_stop->ru_utime.tv_usec)/1000000.0F) -
        ((double)(r_start->ru_utime.tv_sec)+
-        (double)(r_start->ru_utime.tv_usec)/1000000.0);
+        (double)(r_start->ru_utime.tv_usec)/1000000.0F);
 
     s_time = ((double)(r_stop->ru_stime.tv_sec)+
-        (double)(r_stop->ru_stime.tv_usec)/1000000.0) -
+        (double)(r_stop->ru_stime.tv_usec)/1000000.0F) -
        ((double)(r_start->ru_stime.tv_sec)+
-        (double)(r_start->ru_stime.tv_usec)/1000000.0);
+        (double)(r_start->ru_stime.tv_usec)/1000000.0F);
 #endif
 #ifndef H5_HAVE_SYS_TIMEB
     e_time = ((double)(t_stop->tv_sec)+
-        (double)(t_stop->tv_usec)/1000000.0) -
+        (double)(t_stop->tv_usec)/1000000.0F) -
        ((double)(t_start->tv_sec)+
-        (double)(t_start->tv_usec)/1000000.0);
+        (double)(t_start->tv_usec)/1000000.0F);
 #else
     e_time = ((double)(t_stop->tv_sec)+
-        (double)(t_stop->tv_usec)/1000.0) -
+        (double)(t_stop->tv_usec)/1000.0F) -
        ((double)(t_start->tv_sec)+
-        (double)(t_start->tv_usec)/1000.0);
+        (double)(t_start->tv_usec)/1000.0F);
 #endif
     bw = (double)nbytes / e_time;
 
@@ -191,7 +191,7 @@ main (void)
      * 1998-11-06 ptl
      */
     printf ("I/O request size is %1.1fMB\n",
-      (double)(hssize_t)(size[0]*size[1])/1024.0*1024);
+      (double)(hssize_t)(size[0]*size[1])/1024.0F*1024);
 
     /* Open the files */
     file = H5Fcreate (HDF5_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
diff --git a/tools/perform/overhead.c b/tools/perform/overhead.c
index 9341e64..046668f 100644
--- a/tools/perform/overhead.c
+++ b/tools/perform/overhead.c
@@ -209,7 +209,7 @@ test(fill_t fill_style, const double splits[],
     if((fapl = H5Pcreate(H5P_FILE_ACCESS)) < 0) goto error;
     if(!use_rdcc) {
         if(H5Pget_cache(fapl, &mdc_nelmts, NULL, NULL, NULL) < 0) goto error;
-        if(H5Pset_cache(fapl, mdc_nelmts, 0, 0, 0.0) < 0) goto error;
+        if(H5Pset_cache(fapl, mdc_nelmts, 0, 0, 0.0F) < 0) goto error;
     }
     if((file = H5Fcreate(FILE_NAME_1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) goto error;
     if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
diff --git a/tools/perform/sio_perf.c b/tools/perform/sio_perf.c
index 1828d6f..7d75a2d 100644
--- a/tools/perform/sio_perf.c
+++ b/tools/perform/sio_perf.c
@@ -68,7 +68,7 @@
 #define SIO_HDF5            0x4
 
 /* report 0.0 in case t is zero too */
-#define MB_PER_SEC(bytes,t) (((t)==0.0) ? 0.0 : ((((double)bytes) / ONE_MB) / (t)))
+#define MB_PER_SEC(bytes,t) (((t)==0.0F) ? 0.0F : ((((double)bytes) / ONE_MB) / (t)))
 
 #ifndef TRUE
 #define TRUE    1
@@ -451,14 +451,14 @@ run_test(iotype iot, parameters parms, struct options *opts)
     minmax         *read_mm_table=NULL;
     minmax         *read_gross_mm_table=NULL;
     minmax         *read_raw_mm_table=NULL;
-    minmax          write_sys_mm = {0.0, 0.0, 0.0, 0};
-    minmax          write_mm = {0.0, 0.0, 0.0, 0};
-    minmax          write_gross_mm = {0.0, 0.0, 0.0, 0};
-    minmax          write_raw_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_sys_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_gross_mm = {0.0, 0.0, 0.0, 0};
-    minmax          read_raw_mm = {0.0, 0.0, 0.0, 0};
+    minmax          write_sys_mm = {0.0F, 0.0F, 0.0F, 0};
+    minmax          write_mm = {0.0F, 0.0F, 0.0F, 0};
+    minmax          write_gross_mm = {0.0F, 0.0F, 0.0F, 0};
+    minmax          write_raw_mm = {0.0F, 0.0F, 0.0F, 0};
+    minmax          read_sys_mm = {0.0F, 0.0F, 0.0F, 0};
+    minmax          read_mm = {0.0F, 0.0F, 0.0F, 0};
+    minmax          read_gross_mm = {0.0F, 0.0F, 0.0F, 0};
+    minmax          read_raw_mm = {0.0F, 0.0F, 0.0F, 0};
 
     raw_size = (off_t)parms.num_bytes;
     parms.io_type = iot;
@@ -717,7 +717,7 @@ accumulate_minmax_stuff(minmax *mm, int count)
     int i;
     minmax total_mm;
 
-    total_mm.sum = 0.0;
+    total_mm.sum = 0.0F;
     total_mm.max = -DBL_MAX;
     total_mm.min = DBL_MAX;
     total_mm.num = count;
diff --git a/tools/perform/zip_perf.c b/tools/perform/zip_perf.c
index edd5b0f..f73ba40 100644
--- a/tools/perform/zip_perf.c
+++ b/tools/perform/zip_perf.c
@@ -43,10 +43,10 @@
 #define ONE_MB              (ONE_KB * ONE_KB)
 #define ONE_GB              (ONE_MB * ONE_KB)
 
-#define MICROSECOND         1000000.0
+#define MICROSECOND         1000000.0F
 
 /* report 0.0 in case t is zero too */
-#define MB_PER_SEC(bytes,t) ((fabs(t)<0.0000000001) ? 0.0 : ((((double)bytes) / ONE_MB) / (t)))
+#define MB_PER_SEC(bytes,t) ((fabs(t)<0.0000000001F) ? 0.0F : ((((double)bytes) / ONE_MB) / (t)))
 
 #ifndef TRUE
 #define TRUE    1
@@ -182,7 +182,7 @@ write_file(Bytef *source, uLongf sourceLen)
 
     /* destination buffer needs to be at least 0.1% larger than sourceLen
      * plus 12 bytes */
-    destLen = (uLongf)((double)sourceLen + ((double)sourceLen * 0.1)) + 12;
+    destLen = (uLongf)((double)sourceLen + ((double)sourceLen * 0.1F)) + 12;
     dest = (Bytef *)HDmalloc(destLen);
 
     if (!dest)
@@ -464,7 +464,7 @@ do_write_test(unsigned long file_size, unsigned long min_buf_size,
             error("out of memory");
         }
 
-        compression_time = 0.0;
+        compression_time = 0.0F;
 
         if (random_test)
             fill_with_random_data(src, src_len);