# HG changeset patch # User Rik # Date 1452983560 28800 # Node ID 397f6ee4a35d008ac7a057214c38e0838d39cf09 # Parent 529593df22faccc04c6631b37a10fcc45fe77e5f 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". diff -r 529593df22fa -r 397f6ee4a35d libinterp/corefcn/gripes.cc --- 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 diff -r 529593df22fa -r 397f6ee4a35d libinterp/corefcn/gripes.h --- 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");