1
1

Remove a compile warning about the array_of_type pointer mismatch.

This commit was SVN r3595.
Этот коммит содержится в:
George Bosilca 2004-11-17 05:03:05 +00:00
родитель bdc3c7995a
Коммит 8befccfc46

Просмотреть файл

@ -27,48 +27,48 @@ int MPI_Type_create_struct(int count,
MPI_Datatype array_of_types[],
MPI_Datatype *newtype)
{
int i, rc;
int i, rc;
if( MPI_PARAM_CHECK ) {
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if( count < 0 ) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COUNT,
FUNC_NAME);
} else if(NULL == array_of_blocklengths ||
NULL == array_of_displacements ||
NULL == array_of_types) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, FUNC_NAME);
} else if (NULL == newtype) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, FUNC_NAME);
}
for ( i = 0; i < count; i++ ){
if (NULL == array_of_types[i] ||
MPI_DATATYPE_NULL == array_of_types[i]) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE,
FUNC_NAME);
} else if (array_of_blocklengths[i] < 0) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
FUNC_NAME);
}
}
}
if( MPI_PARAM_CHECK ) {
OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
if( count < 0 ) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_COUNT,
FUNC_NAME);
} else if(NULL == array_of_blocklengths ||
NULL == array_of_displacements ||
NULL == array_of_types) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG, FUNC_NAME);
} else if (NULL == newtype) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE, FUNC_NAME);
}
for ( i = 0; i < count; i++ ){
if (NULL == array_of_types[i] ||
MPI_DATATYPE_NULL == array_of_types[i]) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_TYPE,
FUNC_NAME);
} else if (array_of_blocklengths[i] < 0) {
return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, MPI_ERR_ARG,
FUNC_NAME);
}
}
}
rc = ompi_ddt_create_struct ( count, array_of_blocklengths, array_of_displacements,
array_of_types, newtype );
if( rc != MPI_SUCCESS ) {
ompi_ddt_destroy( newtype );
OMPI_ERRHANDLER_RETURN( rc, MPI_COMM_WORLD,
rc, FUNC_NAME );
}
rc = ompi_ddt_create_struct( count, array_of_blocklengths, array_of_displacements,
(const dt_desc_t**)array_of_types, newtype );
if( rc != MPI_SUCCESS ) {
ompi_ddt_destroy( newtype );
OMPI_ERRHANDLER_RETURN( rc, MPI_COMM_WORLD,
rc, FUNC_NAME );
}
{
int* a_i[2];
{
int* a_i[2];
a_i[0] = &count;
a_i[1] = array_of_blocklengths;
ompi_ddt_set_args( *newtype, count + 1, a_i, count, array_of_displacements,
count, array_of_types, MPI_COMBINER_STRUCT );
}
a_i[0] = &count;
a_i[1] = array_of_blocklengths;
ompi_ddt_set_args( *newtype, count + 1, a_i, count, array_of_displacements,
count, array_of_types, MPI_COMBINER_STRUCT );
}
return MPI_SUCCESS;
return MPI_SUCCESS;
}