diff options
author | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-06 18:17:10 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-08 20:06:38 (GMT) |
commit | ad80fae3cc0ece39f510612083cabacd9e059aeb (patch) | |
tree | 67053c97d6b0271dd05be115d87e9d831fbc4927 /tools/lib | |
parent | 97c0b13af6e4471e738dd96180cf42398dc05908 (diff) | |
download | hdf5-ad80fae3cc0ece39f510612083cabacd9e059aeb.zip hdf5-ad80fae3cc0ece39f510612083cabacd9e059aeb.tar.gz hdf5-ad80fae3cc0ece39f510612083cabacd9e059aeb.tar.bz2 |
Merge pull request #2071 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/intel_warnings to develop
* commit '0a2bb11b248df6841daabca3970df5d8504adfc7':
address problems from comments
fix and address comments
change according to previous comments
add missing piece
remove unnecessary check macro
fix intel compile warnings
Revert "fix warnings from Intel compiler"
Revert "fix warnings and some text alignment"
Revert "let hdf5 pick up the right compiler in Intel environment"
Revert "fix issues from previous PR comments"
Revert "using a different MACRO"
using a different MACRO
fix issues from previous PR comments
let hdf5 pick up the right compiler in Intel environment
fix warnings and some text alignment
fix warnings from Intel compiler
Diffstat (limited to 'tools/lib')
-rw-r--r-- | tools/lib/h5diff.c | 2 | ||||
-rw-r--r-- | tools/lib/h5diff_attr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index b22af18..58e3740 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -907,7 +907,7 @@ h5diff(const char *fname1, parallel_print("file1 file2\n"); parallel_print("---------------------------------------\n"); for(u = 0; u < match_list->nobjs; u++) { - char c1, c2; + int c1, c2; c1 = (match_list->objs[u].flags[0]) ? 'x' : ' '; c2 = (match_list->objs[u].flags[1]) ? 'x' : ' '; parallel_print("%5c %6c %-15s\n", c1, c2, match_list->objs[u].name); diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index cd906af..1972d10 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -273,7 +273,7 @@ static herr_t build_match_list_attrs(hid_t loc1_id, hid_t loc2_id, table_attrs_t parallel_print(" obj1 obj2\n"); parallel_print(" --------------------------------------\n"); for(i = 0; i < (unsigned int) table_lp->nattrs; i++) { - char c1, c2; + int c1, c2; c1 = (table_lp->attrs[i].exist[0]) ? 'x' : ' '; c2 = (table_lp->attrs[i].exist[1]) ? 'x' : ' '; parallel_print("%5c %6c %-15s\n", c1, c2, table_lp->attrs[i].name); |