diff options
author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2009-02-11 16:37:46 (GMT) |
---|---|---|
committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2009-02-11 16:37:46 (GMT) |
commit | 8fd5f783b4305485cb1293a90eaaf526e7882e78 (patch) | |
tree | d04301f9c221d6762170fd585518f526c46fa7a3 /tools/lib/h5diff.h | |
parent | c4a18e8ac7c3338281cc5e00fe6a63855838f00a (diff) | |
download | hdf5-8fd5f783b4305485cb1293a90eaaf526e7882e78.zip hdf5-8fd5f783b4305485cb1293a90eaaf526e7882e78.tar.gz hdf5-8fd5f783b4305485cb1293a90eaaf526e7882e78.tar.bz2 |
[svn-r16463] merge from trunk
Bug fix: for compound types, the not comparable test for members was not done
Solution: for compound types, recursively apply that check
Two new cases are added
1) the compound type has a different number of members. Message printed is
<obj1> has X members <obj2> has Y members
Where X and Y are the number of members of each compound type being compared
2) the compound type has not comparable types (for example a double and an int at the same index)
In this case the message
Comparison not possible: object1 is of class1 and object2 is of class2
Is replaced with
Comparison not possible: object1 has a class1 and object2 has a class2
Modified the test generator program to have these 2 cases
Added a shell run for these 2 cases
Tested: h5committest
Diffstat (limited to 'tools/lib/h5diff.h')
-rw-r--r-- | tools/lib/h5diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h index e3dae01..c3cdd3b 100644 --- a/tools/lib/h5diff.h +++ b/tools/lib/h5diff.h @@ -134,7 +134,8 @@ int diff_can_type( hid_t f_type1, /* file data type */ hsize_t *maxdim2, const char *obj1_name, const char *obj2_name, - diff_opt_t *options ); + diff_opt_t *options, + int is_compound); hsize_t diff_attr(hid_t loc1_id, |