summaryrefslogtreecommitdiffstats
path: root/tools/lib
diff options
context:
space:
mode:
authorkmu <kmu@hdfgroup.org>2020-01-23 21:12:00 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-05-20 14:31:52 (GMT)
commit30e61cf0904697c256fb3236fab118d49e2722cf (patch)
tree187e1fc7c2f58121c2d94fc1543fb2a38e6049b1 /tools/lib
parentcfd8856288232b1cd1e495ddfd4aba79d1f60422 (diff)
downloadhdf5-30e61cf0904697c256fb3236fab118d49e2722cf.zip
hdf5-30e61cf0904697c256fb3236fab118d49e2722cf.tar.gz
hdf5-30e61cf0904697c256fb3236fab118d49e2722cf.tar.bz2
squash cast warning fix
Diffstat (limited to 'tools/lib')
-rw-r--r--tools/lib/h5diff.c6
-rw-r--r--tools/lib/h5diff_array.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 4e34b25..a7e263b 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1048,7 +1048,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
*/
#ifdef H5_HAVE_PARALLEL
{
- char *workerTasks = (char*)HDmalloc((g_nTasks - 1) * sizeof(char));
+ char *workerTasks = (char*)HDmalloc((size_t)(g_nTasks - 1) * sizeof(char));
int n;
int busyTasks = 0;
struct diffs_found nFoundbyWorker;
@@ -1057,7 +1057,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
MPI_Status Status;
/*set all tasks as free */
- HDmemset(workerTasks, 1, (g_nTasks - 1));
+ HDmemset(workerTasks, 1, (size_t)(g_nTasks - 1) * sizeof(char));
#endif
for(i = 0; i < table->nobjs; i++) {
@@ -1346,7 +1346,7 @@ diff_match(hid_t file1_id, const char *grp1, trav_info_t *info1,
} /* end while */
for(i = 1; i < g_nTasks; i++)
- MPI_Send(NULL, 0, MPI_BYTE, i, MPI_TAG_END, MPI_COMM_WORLD);
+ MPI_Send(NULL, 0, MPI_BYTE, (int)i, MPI_TAG_END, MPI_COMM_WORLD);
/* Print any final data waiting in our queue */
print_incoming_data();
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index d19c3c1..6cfe3d2 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -4603,7 +4603,7 @@ hbool_t equal_ldouble(long double value, long double expected, diff_opt_t *opts)
return FALSE;
}
- if (H5_DBL_ABS_EQUAL(value, expected))
+ if (H5_LDBL_ABS_EQUAL(value, expected))
return TRUE;
if (opts->use_system_epsilon)