Mercurial > octave
diff libinterp/corefcn/input.cc @ 25659:e6d3f4f9473c
always provide definitions for deprecated functions
Previously, deprecated functions that were defined in source files
instead of as inline functions in header files were not available even
when OCTAVE_USE_DEPRECATED_FUNCTIONS was defined (declarations were
made available, but the definitions were not present, so using them
was impossible).
* input.cc, utils.cc, oct-base64.cc: Always provide
definitions of deprecated functions that are defined in source files.
* lo-specfun.cc: Delete wrappers for functions no longer exist.
* input.h, input.cc (set_default_prompts): Delete wrapper for functon
that no longer exists.
* MArray-i.cc, MArray-s.cc: Delete instantiations of functions that no
longer exist.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 23 Jul 2018 10:15:26 -0400 |
| parents | 467729037209 |
| children | ba8227df92ae |
line wrap: on
line diff
--- a/libinterp/corefcn/input.cc Sun Jul 22 21:52:34 2018 -0700 +++ b/libinterp/corefcn/input.cc Mon Jul 23 10:15:26 2018 -0400 @@ -1641,16 +1641,11 @@ return input_sys.mfile_encoding (args, nargout); } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) +// Always define these functions. The macro is intended to allow the +// declarations to be hidden, not so that Octave will not provide the +// functions if they are requested. -void -set_default_prompts (void) -{ - octave::input_system& input_sys - = octave::__get_input_system__ ("set_default_prompts"); - - input_sys.set_default_prompts (); -} +// #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) bool octave_yes_or_no (const std::string& prompt) @@ -1658,7 +1653,7 @@ octave::input_system& input_sys = octave::__get_input_system__ ("set_default_prompts"); - input_sys.yes_or_no (prompt); + return input_sys.yes_or_no (prompt); } octave_value @@ -1690,4 +1685,4 @@ return octave::command_editor::get_input_stream (); } -#endif +// #endif