From 258602a0962948d699882b9c77d119fe24fda2ed Mon Sep 17 00:00:00 2001 From: stevenj Date: Tue, 31 Aug 2010 21:18:27 -0400 Subject: [PATCH] fix compiler warnings about prototype mismatches in options.c; thanks to Benoit Scherrer darcs-hash:20100901011827-c8de0-0671d98605879992d794934fc521518a73c7e98b.gz --- api/nlopt.h | 6 +++--- api/options.c | 6 +++--- util/stop.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/nlopt.h b/api/nlopt.h index 9f19b5b..d928a47 100644 --- a/api/nlopt.h +++ b/api/nlopt.h @@ -251,14 +251,14 @@ NLOPT_EXTERN(nlopt_result) nlopt_get_xtol_abs(const nlopt_opt opt, double *tol); NLOPT_EXTERN(nlopt_result) nlopt_set_maxeval(nlopt_opt opt, int maxeval); -NLOPT_EXTERN(int) nlopt_get_maxeval(nlopt_opt opt); +NLOPT_EXTERN(int) nlopt_get_maxeval(const nlopt_opt opt); NLOPT_EXTERN(nlopt_result) nlopt_set_maxtime(nlopt_opt opt, double maxtime); -NLOPT_EXTERN(double) nlopt_get_maxtime(nlopt_opt opt); +NLOPT_EXTERN(double) nlopt_get_maxtime(const nlopt_opt opt); NLOPT_EXTERN(nlopt_result) nlopt_force_stop(nlopt_opt opt); NLOPT_EXTERN(nlopt_result) nlopt_set_force_stop(nlopt_opt opt, int val); -NLOPT_EXTERN(int) nlopt_get_force_stop(nlopt_opt opt); +NLOPT_EXTERN(int) nlopt_get_force_stop(const nlopt_opt opt); /* more algorithm-specific parameters */ diff --git a/api/options.c b/api/options.c index 0c86418..3749b7b 100644 --- a/api/options.c +++ b/api/options.c @@ -264,7 +264,7 @@ NLOPT_STDCALL nlopt_set_lower_bounds1(nlopt_opt opt, double lb) } nlopt_result -NLOPT_STDCALL nlopt_get_lower_bounds(nlopt_opt opt, double *lb) +NLOPT_STDCALL nlopt_get_lower_bounds(const nlopt_opt opt, double *lb) { if (opt && (opt->n == 0 || lb)) { memcpy(lb, opt->lb, sizeof(double) * (opt->n)); @@ -296,7 +296,7 @@ NLOPT_STDCALL nlopt_set_upper_bounds1(nlopt_opt opt, double ub) } nlopt_result -NLOPT_STDCALL nlopt_get_upper_bounds(nlopt_opt opt, double *ub) +NLOPT_STDCALL nlopt_get_upper_bounds(const nlopt_opt opt, double *ub) { if (opt && (opt->n == 0 || ub)) { memcpy(ub, opt->ub, sizeof(double) * (opt->n)); @@ -514,7 +514,7 @@ NLOPT_STDCALL nlopt_set_xtol_abs(nlopt_opt opt, const double *xtol_abs) } nlopt_result -NLOPT_STDCALL nlopt_set_xtol_abs1(nlopt_opt opt, const double xtol_abs) +NLOPT_STDCALL nlopt_set_xtol_abs1(nlopt_opt opt, double xtol_abs) { if (opt) { unsigned i; diff --git a/util/stop.c b/util/stop.c index b9cc05d..09e8686 100644 --- a/util/stop.c +++ b/util/stop.c @@ -33,12 +33,12 @@ static int relstop(double vold, double vnew, double reltol, double abstol) || (reltol > 0 && vnew == vold)); /* catch vnew == vold == 0 */ } -int nlopt_stop_ftol(const nlopt_stopping *s, const double f, double oldf) +int nlopt_stop_ftol(const nlopt_stopping *s, double f, double oldf) { return (relstop(oldf, f, s->ftol_rel, s->ftol_abs)); } -int nlopt_stop_f(const nlopt_stopping *s, const double f, double oldf) +int nlopt_stop_f(const nlopt_stopping *s, double f, double oldf) { return (f <= s->minf_max || nlopt_stop_ftol(s, f, oldf)); } -- 2.30.2