mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-21 01:04:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r8483] Purpose:

Browse Source 
Bug fix

Description:
    Fix problems compiling with g++.

Platforms tested:
    FreeBSD 4.9 (sleipnir) w/CC=g++
This commit is contained in:
Quincey Koziol 2004-05-05 15:25:26 -05:00
parent 7f99a80b0a
commit 4996258268
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/H5Ztrans.c
View File

@ -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)
}

4
test/dtransform.c
View File

@ -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;