issues with Intel C 11.1 fixed

This commit is contained in:
2011-06-24 10:10:20 +00:00
parent 8030a7246b
commit c1eadeb678
2 changed files with 10 additions and 4 deletions
+4 -4
View File
@@ -41,8 +41,8 @@ H5FedBeginTraverseEntities (
) {
H5_API_ENTER2 (h5t_iterator_p, "f=0x%p, codim=%d", f, codim);
h5t_iterator_p iter;
TRY2 (iter = h5_calloc (1, sizeof (*iter)));
TRY2 (h5t_init_leaf_iterator (f, iter, codim));
TRY3 (h5t_iterator_p, iter = (h5t_iterator_p)h5_calloc (1, sizeof (*iter)));
TRY3 (h5t_iterator_p, h5t_init_leaf_iterator (f, iter, codim));
H5_API_RETURN (iter);
}
@@ -53,8 +53,8 @@ H5FedBeginTraverseBoundaryFaces (
) {
H5_API_ENTER2 (h5t_iterator_p, "f=0x%p, codim=%d", f, codim);
h5t_iterator_p iter;
TRY2 (iter = h5_calloc (1, sizeof (*iter)));
TRY2 (h5t_init_boundary_face_iterator (f, iter, codim));
TRY3 (h5t_iterator_p, iter = (h5t_iterator_p)h5_calloc (1, sizeof (*iter)));
TRY3 (h5t_iterator_p, h5t_init_boundary_face_iterator (f, iter, codim));
H5_API_RETURN (iter);
}
+6
View File
@@ -180,6 +180,12 @@ done: \
goto done; \
}
#define TRY3( type, expr ) \
if ((int64_t)(ptrdiff_t)(expr) <= (int64_t)H5_ERR) { \
ret_value = (type) H5_ERR; \
goto done; \
}
#ifdef __cplusplus
}
#endif