# HG changeset patch # User Rik # Date 1452987225 28800 # Node ID 4484384a2959f121d939ee496c8bdb06ed39fab3 # Parent 397f6ee4a35d008ac7a057214c38e0838d39cf09 Deprecate gripe_not_supported. * gripes.h (gripe_not_supported): Mark with OCTAVE_DEPRECATED. Add FIXME note with date of deprecation and scheduled removal. * gripes.cc (gripe_not_supported): Add FIXME note with date of deprecation and scheduled removal. * __glpk__.cc (Fglpk): Replace gripe_not_supported with gripe_disabled_feature. diff -r 397f6ee4a35d -r 4484384a2959 libinterp/corefcn/gripes.cc --- a/libinterp/corefcn/gripes.cc Sat Jan 16 14:32:40 2016 -0800 +++ b/libinterp/corefcn/gripes.cc Sat Jan 16 15:33:45 2016 -0800 @@ -149,6 +149,7 @@ error ("%s: not implemented", fcn); } +// FIXME: Deprecated in 4.2, remove in 4.6 void gripe_not_supported (const char *fcn) { diff -r 397f6ee4a35d -r 4484384a2959 libinterp/corefcn/gripes.h --- a/libinterp/corefcn/gripes.h Sat Jan 16 14:32:40 2016 -0800 +++ b/libinterp/corefcn/gripes.h Sat Jan 16 15:33:45 2016 -0800 @@ -89,7 +89,8 @@ OCTAVE_NORETURN OCTINTERP_API extern void gripe_not_implemented (const char *); -OCTAVE_NORETURN OCTINTERP_API extern +// FIXME: Deprecated in 4.2, remove in 4.6 +OCTAVE_DEPRECATED OCTAVE_NORETURN OCTINTERP_API extern void gripe_not_supported (const char *); OCTAVE_NORETURN OCTINTERP_API extern diff -r 397f6ee4a35d -r 4484384a2959 libinterp/dldfcn/__glpk__.cc --- a/libinterp/dldfcn/__glpk__.cc Sat Jan 16 14:32:40 2016 -0800 +++ b/libinterp/dldfcn/__glpk__.cc Sat Jan 16 15:33:45 2016 -0800 @@ -625,9 +625,7 @@ return ovl (xmin, fmin, errnum, extra); #else - - gripe_not_supported ("glpk"); - + gripe_disabled_feature ("glpk", "GNU Linear Programming Kit"); #endif }