Mercurial > octave

changeset 21081:397f6ee4a35d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Extend msg from gripe_disabled_feature to handle case where libraries not available. * gripes.h (gripe_disabled_feature): Use 'fcn' rather than 'func' for variable name. * gripes.cc (gripe_disabled_feature): Use 'fcn' rather than 'func' for variable name. Change message to "support for %s was unavailable or disabled when %s was built".
author Rik <rik@octave.org>
date Sat, 16 Jan 2016 14:32:40 -0800
parents 529593df22fa
children 4484384a2959
files libinterp/corefcn/gripes.cc libinterp/corefcn/gripes.h
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/gripes.cc	Fri Jan 15 20:28:09 2016 -0800
+++ b/libinterp/corefcn/gripes.cc	Sat Jan 16 14:32:40 2016 -0800
@@ -55,11 +55,11 @@
 }
 
 void
-gripe_disabled_feature (const std::string& func, const std::string& feature,
+gripe_disabled_feature (const std::string& fcn, const std::string& feature,
                         const std::string& pkg /*="Octave"*/)
 {
-  error ("%s: support for %s was disabled when %s was built",
-         func.c_str (), feature.c_str (), pkg.c_str ());
+  error ("%s: support for %s was unavailable or disabled when %s was built",
+         fcn.c_str (), feature.c_str (), pkg.c_str ());
 }
 
 void
--- a/libinterp/corefcn/gripes.h	Fri Jan 15 20:28:09 2016 -0800
+++ b/libinterp/corefcn/gripes.h	Sat Jan 16 14:32:40 2016 -0800
@@ -44,7 +44,7 @@
 gripe_data_file_in_path (const std::string& fcn, const std::string& file);
 
 OCTAVE_NORETURN OCTINTERP_API extern
-void gripe_disabled_feature (const std::string& func,
+void gripe_disabled_feature (const std::string& fcn,
                              const std::string& feature,
                              const std::string& pkg="Octave");