Mercurial > octave
diff libinterp/dldfcn/fftw.cc @ 20700:68e3a747ca02
rename octave_value value extractors that accept error message args
* ov.h, ov.cc (octave_value::xcell_value, octave_value::xstring_value,
octave_value::xcellstr_value): Rename functions that accept error
message args. Handle error directly. Only forward to functions that
don't attempt type conversion. Change all uses.
* ov-base.h, ov-base.cc (octave_base_value::xstring_value): Don't do
type conversion.
(octave_base_value::cell_value, octave_base_value::cellstr_value):
Delete versions that accept error message args.
* ov-str-mat.h, ov-str-mat.cc (octave_char_matrix_str::string_value,
octave_char_matrix_str::cell_value): Delete.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 13 Nov 2015 14:10:26 -0500 |
| parents | 10ec79b47808 |
| children | 7b608fadc663 |
line wrap: on
line diff
--- a/libinterp/dldfcn/fftw.cc Thu Nov 12 19:27:25 2015 -0800 +++ b/libinterp/dldfcn/fftw.cc Fri Nov 13 14:10:26 2015 -0500 @@ -143,7 +143,7 @@ } #if defined (HAVE_FFTW) - std::string arg0 = args(0).string_value ("fftw: first argument must be a string"); + std::string arg0 = args(0).xstring_value ("fftw: first argument must be a string"); if (arg0 == "planner") { @@ -153,7 +153,7 @@ std::transform (arg0.begin (), arg0.end (), arg0.begin (), tolower); - std::string arg1 = args(1).string_value ("fftw: planner expects a string value as METHOD"); + std::string arg1 = args(1).xstring_value ("fftw: planner expects a string value as METHOD"); std::transform (arg1.begin (), arg1.end (), arg1.begin (), tolower); @@ -229,7 +229,7 @@ std::transform (arg0.begin (), arg0.end (), arg0.begin (), tolower); - std::string arg1 = args(1).string_value ("fftw: WISDOM must be a string"); + std::string arg1 = args(1).xstring_value ("fftw: WISDOM must be a string"); char *str = fftw_export_wisdom_to_string (); @@ -263,7 +263,7 @@ std::transform (arg0.begin (), arg0.end (), arg0.begin (), tolower); - std::string arg1 = args(1).string_value ("fftw: WISDOM must be a string"); + std::string arg1 = args(1).xstring_value ("fftw: WISDOM must be a string"); char *str = fftwf_export_wisdom_to_string ();