diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-05-21 19:29:40 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-05-21 19:29:40 (GMT) |
| commit | 55fbd675c64c387609b7f7d7d200766348287774 (patch) | |
| tree | 8502acd2b3cf5ad7968012962fdbd175ee217457 /tools | |
| parent | 38e7d9044217414d1d09a32e226e3e8dcfd1e977 (diff) | |
| download | hdf5-55fbd675c64c387609b7f7d7d200766348287774.zip hdf5-55fbd675c64c387609b7f7d7d200766348287774.tar.gz hdf5-55fbd675c64c387609b7f7d7d200766348287774.tar.bz2 | |
[svn-r16976] Description:
Merge r16960:16975 from trunk into revise_chunks branch.
Tested on:
Mac OS X/32 10.5.7 (amazon)
(h5committest not required on this branch)
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5diff/testfiles/h5diff_202.txt | 2 | ||||
| -rw-r--r-- | tools/lib/h5diff_dset.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5diff/testfiles/h5diff_202.txt b/tools/h5diff/testfiles/h5diff_202.txt index ee240c2..fd4a191 100644 --- a/tools/h5diff/testfiles/h5diff_202.txt +++ b/tools/h5diff/testfiles/h5diff_202.txt @@ -1,2 +1,2 @@ -</g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER +Not comparable: </g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER Not comparable: </g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2 diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 0f53192..bbfa351 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -708,7 +708,7 @@ int diff_can_type( hid_t f_tid1, /* file data type */ { - parallel_print("<%s> is of class %s and <%s> is of class %s\n", + parallel_print("Not comparable: <%s> is of class %s and <%s> is of class %s\n", obj1_name, get_class(tclass1), obj2_name, get_class(tclass2) ); |