From fa656be59d1335d0c8d8c68314273544b523f41e Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Wed, 20 May 2009 09:23:23 -0500 Subject: [svn-r16965] merge 16964 from trunk bug fix: the phrase "Not comparable" was not being printed for the case of different classes tested: windows, linux --- tools/h5diff/testfiles/h5diff_202.txt | 2 +- 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 @@ - is of class H5T_FLOAT and is of class H5T_INTEGER +Not comparable: is of class H5T_FLOAT and is of class H5T_INTEGER Not comparable: has sign H5T_SGN_ERROR and 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) ); -- cgit v0.12