changeset 21082:4484384a2959

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.
author Rik <rik@octave.org>
date Sat, 16 Jan 2016 15:33:45 -0800
parents 397f6ee4a35d
children 8c9755d29d2a
files libinterp/corefcn/gripes.cc libinterp/corefcn/gripes.h libinterp/dldfcn/__glpk__.cc
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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)
 {
--- 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
--- 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
 }