diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-05-05 20:25:26 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-05-05 20:25:26 (GMT) |
| commit | 49962582685cd642226f4af26c10487323f2490a (patch) | |
| tree | a66a172042fbc945a4319fa67a1440d2fe6d9357 | |
| parent | 7f99a80b0abee64d09ada9be749196cf8185eaf2 (diff) | |
| download | hdf5-49962582685cd642226f4af26c10487323f2490a.zip hdf5-49962582685cd642226f4af26c10487323f2490a.tar.gz hdf5-49962582685cd642226f4af26c10487323f2490a.tar.bz2 | |
[svn-r8483] Purpose:
Bug fix
Description:
Fix problems compiling with g++.
Platforms tested:
FreeBSD 4.9 (sleipnir) w/CC=g++
| -rw-r--r-- | src/H5Ztrans.c | 9 | ||||
| -rw-r--r-- | test/dtransform.c | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c index 3d1ff41..04f3a52 100644 --- a/src/H5Ztrans.c +++ b/src/H5Ztrans.c @@ -380,11 +380,12 @@ done: static H5Z_node * H5Z_parse_expression(H5Z_token *current) { + H5Z_node *expr; void* ret_value=NULL; - - FUNC_ENTER_NOAPI(H5Z_parse_expression, NULL) - H5Z_node *expr = H5Z_parse_term(current); + FUNC_ENTER_NOAPI_NOINIT(H5Z_parse_expression) + + expr = H5Z_parse_term(current); for (;;) { H5Z_node *new_node; @@ -447,8 +448,6 @@ H5Z_parse_expression(H5Z_token *current) done: FUNC_LEAVE_NOAPI(expr) - - } diff --git a/test/dtransform.c b/test/dtransform.c index 0f2e4e8..b3a0943 100644 --- a/test/dtransform.c +++ b/test/dtransform.c @@ -60,7 +60,7 @@ int main() windchillCcalc[row][col] = (5/9.0)*(windchillF[row][col] - 32); } - if( (compare(windchillCread, windchillCcalc)) == 0) + if( (compare((int*)windchillCread, (int*)windchillCcalc)) == 0) { fprintf(stderr, "ERROR: Conversion failed to match computed data\n"); TEST_ERROR; @@ -68,7 +68,7 @@ int main() else { err = H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, dxpl_id_c_to_f, windchillFread); - if( (compare(windchillF, windchillFread)) == 0) + if( (compare((int *)windchillF, (int *)windchillFread)) == 0) { fprintf(stderr, "ERROR: Conversion failed to match computed data\n"); TEST_ERROR; |