Changed SetPrecond prototypes so that they compile without warnings in C++.

This commit is contained in:
falgout 1999-04-23 21:53:16 +00:00
parent e047b8261c
commit 317f6325eb
8 changed files with 40 additions and 16 deletions

View File

@ -132,7 +132,7 @@ int HYPRE_StructHybridSetDSCGMaxIter P((HYPRE_StructSolver solver , int dscg_max
int HYPRE_StructHybridSetPCGMaxIter P((HYPRE_StructSolver solver , int pcg_max_its ));
int HYPRE_StructHybridSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructHybridSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructHybridGetNumIterations P((HYPRE_StructSolver solver , int *num_its ));
int HYPRE_StructHybridGetDSCGNumIterations P((HYPRE_StructSolver solver , int *dscg_num_its ));
@ -148,7 +148,7 @@ int HYPRE_StructPCGSetTol P((HYPRE_StructSolver solver , double tol ));
int HYPRE_StructPCGSetMaxIter P((HYPRE_StructSolver solver , int max_iter ));
int HYPRE_StructPCGSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructPCGSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructPCGGetNumIterations P((HYPRE_StructSolver solver , int *num_iterations ));
int HYPRE_StructPCGGetFinalRelativeResidualNorm P((HYPRE_StructSolver solver , double *norm ));

View File

@ -139,8 +139,14 @@ HYPRE_StructHybridSetRelChange( HYPRE_StructSolver solver,
int
HYPRE_StructHybridSetPrecond( HYPRE_StructSolver solver,
int (*precond)(),
int (*precond_setup)(),
int (*precond)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
int (*precond_setup)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
HYPRE_StructSolver precond_solver )
{
return( hypre_HybridSetPrecond( (void *) solver,

View File

@ -241,8 +241,14 @@ headers.h
int
HYPRE_StructPCGSetPrecond( HYPRE_StructSolver solver,
int (*precond)(),
int (*precond_setup)(),
int (*precond)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
int (*precond_setup)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
HYPRE_StructSolver precond_solver )
{
return( hypre_PCGSetPrecond( (void *) solver,

View File

@ -29,7 +29,7 @@ int HYPRE_StructHybridSetDSCGMaxIter P((HYPRE_StructSolver solver , int dscg_max
int HYPRE_StructHybridSetPCGMaxIter P((HYPRE_StructSolver solver , int pcg_max_its ));
int HYPRE_StructHybridSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructHybridSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructHybridGetNumIterations P((HYPRE_StructSolver solver , int *num_its ));
int HYPRE_StructHybridGetDSCGNumIterations P((HYPRE_StructSolver solver , int *dscg_num_its ));
@ -45,7 +45,7 @@ int HYPRE_StructPCGSetTol P((HYPRE_StructSolver solver , double tol ));
int HYPRE_StructPCGSetMaxIter P((HYPRE_StructSolver solver , int max_iter ));
int HYPRE_StructPCGSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructPCGSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructPCGGetNumIterations P((HYPRE_StructSolver solver , int *num_iterations ));
int HYPRE_StructPCGGetFinalRelativeResidualNorm P((HYPRE_StructSolver solver , double *norm ));

View File

@ -132,7 +132,7 @@ int HYPRE_StructHybridSetDSCGMaxIter P((HYPRE_StructSolver solver , int dscg_max
int HYPRE_StructHybridSetPCGMaxIter P((HYPRE_StructSolver solver , int pcg_max_its ));
int HYPRE_StructHybridSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructHybridSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructHybridGetNumIterations P((HYPRE_StructSolver solver , int *num_its ));
int HYPRE_StructHybridGetDSCGNumIterations P((HYPRE_StructSolver solver , int *dscg_num_its ));
@ -148,7 +148,7 @@ int HYPRE_StructPCGSetTol P((HYPRE_StructSolver solver , double tol ));
int HYPRE_StructPCGSetMaxIter P((HYPRE_StructSolver solver , int max_iter ));
int HYPRE_StructPCGSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructPCGSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructPCGGetNumIterations P((HYPRE_StructSolver solver , int *num_iterations ));
int HYPRE_StructPCGGetFinalRelativeResidualNorm P((HYPRE_StructSolver solver , double *norm ));

View File

@ -139,8 +139,14 @@ HYPRE_StructHybridSetRelChange( HYPRE_StructSolver solver,
int
HYPRE_StructHybridSetPrecond( HYPRE_StructSolver solver,
int (*precond)(),
int (*precond_setup)(),
int (*precond)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
int (*precond_setup)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
HYPRE_StructSolver precond_solver )
{
return( hypre_HybridSetPrecond( (void *) solver,

View File

@ -241,8 +241,14 @@ headers.h
int
HYPRE_StructPCGSetPrecond( HYPRE_StructSolver solver,
int (*precond)(),
int (*precond_setup)(),
int (*precond)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
int (*precond_setup)(HYPRE_StructSolver,
HYPRE_StructMatrix,
HYPRE_StructVector,
HYPRE_StructVector),
HYPRE_StructSolver precond_solver )
{
return( hypre_PCGSetPrecond( (void *) solver,

View File

@ -29,7 +29,7 @@ int HYPRE_StructHybridSetDSCGMaxIter P((HYPRE_StructSolver solver , int dscg_max
int HYPRE_StructHybridSetPCGMaxIter P((HYPRE_StructSolver solver , int pcg_max_its ));
int HYPRE_StructHybridSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructHybridSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructHybridSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructHybridGetNumIterations P((HYPRE_StructSolver solver , int *num_its ));
int HYPRE_StructHybridGetDSCGNumIterations P((HYPRE_StructSolver solver , int *dscg_num_its ));
@ -45,7 +45,7 @@ int HYPRE_StructPCGSetTol P((HYPRE_StructSolver solver , double tol ));
int HYPRE_StructPCGSetMaxIter P((HYPRE_StructSolver solver , int max_iter ));
int HYPRE_StructPCGSetTwoNorm P((HYPRE_StructSolver solver , int two_norm ));
int HYPRE_StructPCGSetRelChange P((HYPRE_StructSolver solver , int rel_change ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(), int (*precond_setup )(), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetPrecond P((HYPRE_StructSolver solver , int (*precond )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), int (*precond_setup )(HYPRE_StructSolver ,HYPRE_StructMatrix ,HYPRE_StructVector ,HYPRE_StructVector ), HYPRE_StructSolver precond_solver ));
int HYPRE_StructPCGSetLogging P((HYPRE_StructSolver solver , int logging ));
int HYPRE_StructPCGGetNumIterations P((HYPRE_StructSolver solver , int *num_iterations ));
int HYPRE_StructPCGGetFinalRelativeResidualNorm P((HYPRE_StructSolver solver , double *norm ));