diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-03-11 22:51:14 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-03-11 22:51:14 (GMT) |
| commit | 7659506fa895d00ddaeba68603689e51ca263fb3 (patch) | |
| tree | da50a04e4e87cc723c9eb1a0b303483526b889aa /tools | |
| parent | 88ac8e8929f6fd99732a1e08ced4ea82bfb230f1 (diff) | |
| download | hdf5-7659506fa895d00ddaeba68603689e51ca263fb3.zip hdf5-7659506fa895d00ddaeba68603689e51ca263fb3.tar.gz hdf5-7659506fa895d00ddaeba68603689e51ca263fb3.tar.bz2 | |
[svn-r26438] Fixed some double promotion warnings from gcc 4.9.2. Most were in
format strings.
Tested on: h5committest
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/h5dump_xml.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_str.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5dump/h5dump_xml.c b/tools/h5dump/h5dump_xml.c index 64667cb..6ccbc8c 100644 --- a/tools/h5dump/h5dump_xml.c +++ b/tools/h5dump/h5dump_xml.c @@ -3563,7 +3563,7 @@ xml_dump_fill_value(hid_t dcpl, hid_t type) /* Render the element */ h5tools_str_reset(&buffer); - h5tools_str_append(&buffer, "\"%f\"", *(float *) buf); + h5tools_str_append(&buffer, "\"%f\"", (double)*(float *)buf); h5tools_render_element(rawoutstream, outputformat, &ctx, &buffer, &curr_pos, (size_t)outputformat->line_ncols, (hsize_t)0, (hsize_t)0); ctx.need_prefix = TRUE; diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index 3160cfa..f4302a9 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -740,7 +740,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai float tempfloat; HDmemcpy(&tempfloat, vp, sizeof(float)); - h5tools_str_append(str, OPT(info->fmt_float, "%g"), tempfloat); + h5tools_str_append(str, OPT(info->fmt_float, "%g"), (double)tempfloat); } else if (sizeof(double) == nsize) { /* if (H5Tequal(type, H5T_NATIVE_DOUBLE)) */ |