Mercurial > octave
changeset 23247:d4834e9ac2e7
maint: Merge stable to default.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 06 Mar 2017 10:58:55 -0500 |
| parents | 184ab9034ad5 (current diff) 9b5d5c2697bc (diff) |
| children | 529c6d0c6684 |
| files | libinterp/parse-tree/jit-typeinfo.cc |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/CITATION Mon Mar 06 10:58:24 2017 -0500 +++ b/CITATION Mon Mar 06 10:58:55 2017 -0500 @@ -1,17 +1,17 @@ To cite GNU Octave in publications use: - John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2016). - GNU Octave version 4.2.0 manual: a high-level interactive language for + John W. Eaton, David Bateman, Søren Hauberg, Rik Wehbring (2017). + GNU Octave version 4.2.1 manual: a high-level interactive language for numerical computations. - URL http://www.gnu.org/software/octave/doc/interpreter/ + URL https://www.gnu.org/software/octave/doc/v4.2.1/ A BibTeX entry for LaTeX users is: @manual{, - title = {{GNU Octave} version 4.2.0 manual: a high-level interactive language for numerical computations}, + title = {{GNU Octave} version 4.2.1 manual: a high-level interactive language for numerical computations}, author = {John W. Eaton and David Bateman and S{\o}ren Hauberg and Rik Wehbring}, - year = {2016}, - url = {http://www.gnu.org/software/octave/doc/interpreter}, + year = {2017}, + url = {https://www.gnu.org/software/octave/doc/v4.2.1/}, } We have invested a lot of time and effort in creating GNU Octave, please cite it
--- a/libinterp/parse-tree/jit-typeinfo.cc Mon Mar 06 10:58:24 2017 -0500 +++ b/libinterp/parse-tree/jit-typeinfo.cc Mon Mar 06 10:58:55 2017 -0500 @@ -213,7 +213,7 @@ } extern "C" void -octave_jit_octave::err_nan_to_logical_conversion (void) +octave_jit_err_nan_to_logical_conversion (void) { octave::err_nan_to_logical_conversion (); } @@ -1505,7 +1505,7 @@ logically_true_fn.stash_name ("logically_true"); jit_function gripe_nantl - = create_external (JIT_FN (octave_jit_octave::err_nan_to_logical_conversion), 0); + = create_external (JIT_FN (octave_jit_err_nan_to_logical_conversion), 0); gripe_nantl.mark_can_error (); fn = create_internal ("octave_jit_logically_true_scalar", boolean, scalar);