diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2013-08-18 00:31:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2013-08-18 00:31:01 (GMT) |
| commit | 6e58f671ec62120246a94101a80a47259ffb96c3 (patch) | |
| tree | 204ba14aa8e2fad6bb78ef8128c3f98c48e26f39 /tools/h5diff | |
| parent | b5a5441e7c5eb09cb53677326c3e84f80acdf108 (diff) | |
| download | hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.zip hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.gz hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.bz2 | |
[svn-r24021] Description:
Bring r24020 from trunk to 1.8 branch:
Clean up compiler warnings
Tested on:
Mac OSX/64 10.8.4 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/h5diffgentest.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c index b5e0ae6..d8b3b34 100644 --- a/tools/h5diff/h5diffgentest.c +++ b/tools/h5diff/h5diffgentest.c @@ -560,8 +560,8 @@ int test_basic(const char *fname1, const char *fname2, const char *fname3) int data4[3][2] = {{0,0},{0,0},{0,0}}; int data5[2][2] = {{0,0},{0,0}}; unsigned int data6[3][2] = {{0,0},{0,0},{0,0}}; - cmp1_t data7[1] = {1,2}; - cmp2_t data8[1] = {1,2}; + cmp1_t data7[1] = {{1,2}}; + cmp2_t data8[1] = {{1,2}}; hsize_t dims3[2] = { 2,2 }; hsize_t dims4[1] = { 1 }; size_t type_size; @@ -3664,9 +3664,6 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int }; hsize_t dims_fixlen_str_array[] = {FIXLEN_STR_ARRY_DIM}; - /* objref */ - hsize_t objref_dims[1]={1}; - /*------------------------------------------ * compound dataset *------------------------------------------*/ @@ -4873,7 +4870,7 @@ static void test_data_nocomparables (const char * fname, int make_diffs) int data1[DIM_ARRY] = {0,0,0}; int data2[DIM_ARRY] = {1,1,1}; int data3[DIM_ARRY+1] = {1,1,1,1}; - int data1_dim2[DIM_ARRY][1] = {0,0,0}; + int data1_dim2[DIM_ARRY][1] = {{0,0,0}}; int rank_attr; char data1_str[DIM_ARRY][STR_SIZE]= {"ab","cd","ef"}; herr_t status = SUCCEED; |