diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-06-18 21:03:30 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-06-18 21:03:30 (GMT) |
commit | 23465486edeb6e9d76ae795d523bedbf4e665d64 (patch) | |
tree | 3831eaca941ba6521cd31463bfdcb8739805bb3a /test/cmpd_dset.c | |
parent | d6f7fda058353212449fce012787d0d46d866f2f (diff) | |
download | hdf5-23465486edeb6e9d76ae795d523bedbf4e665d64.zip hdf5-23465486edeb6e9d76ae795d523bedbf4e665d64.tar.gz hdf5-23465486edeb6e9d76ae795d523bedbf4e665d64.tar.bz2 |
[svn-r432] Changes since 19980617
----------------------
./html/Datatypes.html
./src/H5T.c
./src/H5Tconv.c
./src/H5Tpkg.h
./src/H5Tpublic.h
./src/H5detect.c
./test/cmpd_dset.c
./test/dsets.c
./test/dtypes.c
./test/external.c
./test/tattr.c
./test/th5s.c
Organized the predefined data types.
./html/H5.intro.html
NO MODIFICATIONS! This file is a mess (obviously generated
from something else) so I skipped updating it!
./src/h5ls.c
./test/dsets.c
./test/tattr.c
./test/th5s.c
Added extra argument to H5Sget_dims() calls per Albert's last
update.
Diffstat (limited to 'test/cmpd_dset.c')
-rw-r--r-- | test/cmpd_dset.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/test/cmpd_dset.c b/test/cmpd_dset.c index 1ccbe85..694ce3d 100644 --- a/test/cmpd_dset.c +++ b/test/cmpd_dset.c @@ -189,11 +189,11 @@ STEP 1: Initialize dataset `s1' and store it on disk in native order.\n"); /* Create the memory data type */ s1_tid = H5Tcreate (H5T_COMPOUND, sizeof(s1_t)); - H5Tinsert (s1_tid, "a", HPOFFSET(s1,a), H5T_NATIVE_INT); - H5Tinsert (s1_tid, "b", HPOFFSET(s1,b), H5T_NATIVE_INT); - H5Tinsert (s1_tid, "c", HPOFFSET(s1,c), H5T_NATIVE_INT); - H5Tinsert (s1_tid, "d", HPOFFSET(s1,d), H5T_NATIVE_INT); - H5Tinsert (s1_tid, "e", HPOFFSET(s1,e), H5T_NATIVE_INT); + H5Tinsert (s1_tid, "a", HOFFSET(s1_t,a), H5T_NATIVE_INT); + H5Tinsert (s1_tid, "b", HOFFSET(s1_t,b), H5T_NATIVE_INT); + H5Tinsert (s1_tid, "c", HOFFSET(s1_t,c), H5T_NATIVE_INT); + H5Tinsert (s1_tid, "d", HOFFSET(s1_t,d), H5T_NATIVE_INT); + H5Tinsert (s1_tid, "e", HOFFSET(s1_t,e), H5T_NATIVE_INT); assert (s1_tid>=0); /* Create the dataset */ @@ -218,11 +218,11 @@ STEP 2: Read the dataset from disk into a new memory buffer which has the\n\ /* Create a data type for s2 */ s2_tid = H5Tcreate (H5T_COMPOUND, sizeof(s2_t)); - H5Tinsert (s2_tid, "a", HPOFFSET(s2,a), H5T_NATIVE_INT); - H5Tinsert (s2_tid, "b", HPOFFSET(s2,b), H5T_NATIVE_INT); - H5Tinsert (s2_tid, "c", HPOFFSET(s2,c), H5T_NATIVE_INT); - H5Tinsert (s2_tid, "d", HPOFFSET(s2,d), H5T_NATIVE_INT); - H5Tinsert (s2_tid, "e", HPOFFSET(s2,e), H5T_NATIVE_INT); + H5Tinsert (s2_tid, "a", HOFFSET(s2_t,a), H5T_NATIVE_INT); + H5Tinsert (s2_tid, "b", HOFFSET(s2_t,b), H5T_NATIVE_INT); + H5Tinsert (s2_tid, "c", HOFFSET(s2_t,c), H5T_NATIVE_INT); + H5Tinsert (s2_tid, "d", HOFFSET(s2_t,d), H5T_NATIVE_INT); + H5Tinsert (s2_tid, "e", HOFFSET(s2_t,e), H5T_NATIVE_INT); assert (s2_tid>=0); /* Read the data */ @@ -250,11 +250,11 @@ STEP 3: Read the dataset again with members in a different order.\n"); /* Create a data type for s3 */ s3_tid = H5Tcreate (H5T_COMPOUND, sizeof(s3_t)); - H5Tinsert (s3_tid, "a", HPOFFSET(s3,a), H5T_NATIVE_INT); - H5Tinsert (s3_tid, "b", HPOFFSET(s3,b), H5T_NATIVE_INT); - H5Tinsert (s3_tid, "c", HPOFFSET(s3,c), H5T_NATIVE_INT); - H5Tinsert (s3_tid, "d", HPOFFSET(s3,d), H5T_NATIVE_INT); - H5Tinsert (s3_tid, "e", HPOFFSET(s3,e), H5T_NATIVE_INT); + H5Tinsert (s3_tid, "a", HOFFSET(s3_t,a), H5T_NATIVE_INT); + H5Tinsert (s3_tid, "b", HOFFSET(s3_t,b), H5T_NATIVE_INT); + H5Tinsert (s3_tid, "c", HOFFSET(s3_t,c), H5T_NATIVE_INT); + H5Tinsert (s3_tid, "d", HOFFSET(s3_t,d), H5T_NATIVE_INT); + H5Tinsert (s3_tid, "e", HOFFSET(s3_t,e), H5T_NATIVE_INT); assert (s3_tid>=0); /* Read the data */ @@ -281,8 +281,8 @@ STEP 4: Read a subset of the members.\n"); /* Create a datatype for s4 */ s4_tid = H5Tcreate (H5T_COMPOUND, sizeof(s4_t)); - H5Tinsert (s4_tid, "b", HPOFFSET(s4,b), H5T_NATIVE_INT); - H5Tinsert (s4_tid, "d", HPOFFSET(s4,d), H5T_NATIVE_INT); + H5Tinsert (s4_tid, "b", HOFFSET(s4_t,b), H5T_NATIVE_INT); + H5Tinsert (s4_tid, "d", HOFFSET(s4_t,d), H5T_NATIVE_INT); assert (s4_tid>=0); /* Read the data */ @@ -314,11 +314,11 @@ STEP 5: Read members into a superset which is partially initialized.\n"); /* Create a data type for s5 */ s5_tid = H5Tcreate (H5T_COMPOUND, sizeof(s5_t)); - H5Tinsert (s5_tid, "a", HPOFFSET(s5,a), H5T_NATIVE_INT); - H5Tinsert (s5_tid, "b", HPOFFSET(s5,b), H5T_NATIVE_INT); - H5Tinsert (s5_tid, "c", HPOFFSET(s5,c), H5T_NATIVE_INT); - H5Tinsert (s5_tid, "d", HPOFFSET(s5,d), H5T_NATIVE_INT); - H5Tinsert (s5_tid, "e", HPOFFSET(s5,e), H5T_NATIVE_INT); + H5Tinsert (s5_tid, "a", HOFFSET(s5_t,a), H5T_NATIVE_INT); + H5Tinsert (s5_tid, "b", HOFFSET(s5_t,b), H5T_NATIVE_INT); + H5Tinsert (s5_tid, "c", HOFFSET(s5_t,c), H5T_NATIVE_INT); + H5Tinsert (s5_tid, "d", HOFFSET(s5_t,d), H5T_NATIVE_INT); + H5Tinsert (s5_tid, "e", HOFFSET(s5_t,e), H5T_NATIVE_INT); assert (s5_tid>=0); /* Read the data */ |