Mercurial > hg > octave-nkf
diff liboctave/DiagArray2.cc @ 14628:63ae976ac2e7 stable
preserve DiagArray2 interface for stable release series
* DiagArray2.h (DiagArray2::checkelem): Restore function. Provide
non-const version.
(DiagArray2::check_idx): Return bool status.
(DiagArray2::operator ()): Call checkelem, not check_idx.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 12 May 2012 12:31:34 -0400 |
| parents | 6250e1232c9c |
| children | fd5c0159b588 |
line wrap: on
line diff
--- a/liboctave/DiagArray2.cc +++ b/liboctave/DiagArray2.cc @@ -82,16 +82,6 @@ // A two-dimensional array with diagonal elements only. -template <typename T> -void -DiagArray2<T>::check_idx (octave_idx_type r, octave_idx_type c) const -{ - if (r < 0 || r >= dim1 ()) - gripe_index_out_of_range (2, 1, r+1, dim1 ()); - if (c < 0 || c >= dim2 ()) - gripe_index_out_of_range (2, 2, c+1, dim2 ()); -} - template <class T> void DiagArray2<T>::resize (octave_idx_type r, octave_idx_type c, @@ -121,3 +111,24 @@ return result; } + +template <typename T> +bool +DiagArray2<T>::check_idx (octave_idx_type r, octave_idx_type c) const +{ + bool ok = true; + + if (r < 0 || r >= dim1 ()) + { + gripe_index_out_of_range (2, 1, r+1, dim1 ()); + ok = false; + } + + if (c < 0 || c >= dim2 ()) + { + gripe_index_out_of_range (2, 2, c+1, dim2 ()); + ok = false; + } + + return ok; +}