Mercurial > octave-nkf
changeset 6690:fd242dccd221
[project @ 2007-06-04 22:44:32 by dbateman]
| author | dbateman |
|---|---|
| date | Mon, 04 Jun 2007 22:44:32 +0000 |
| parents | 8e0444d90050 |
| children | c6ee6c342699 |
| files | src/ChangeLog src/DLD-FUNCTIONS/symrcm.cc |
| diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jun 04 22:28:19 2007 +0000 +++ b/src/ChangeLog Mon Jun 04 22:44:32 2007 +0000 @@ -1,3 +1,8 @@ +2007-05-08 Michael Weitzel <michael.weitzel@uni-siegen.de> + + * DLD-FUNCTIONS/symrcm.cc: Fix for queuing error that might cause + an infinite loop. + 2007-06-04 John W. Eaton <jwe@octave.org> * data.cc (Fislogical): Rename from Fisbool. @@ -28,7 +33,6 @@ * ov-re-sparse.cc (octave_sparse_matrix::as_mxArray): ditto. * ov-struct.cc (octave_struct::as_mxArray): ditto. ->>>>>>> 1.1759 2007-06-02 David Bateman <dbateman@free.fr> * graphics.cc (color_property class): g++ doesn't like anonymous
--- a/src/DLD-FUNCTIONS/symrcm.cc Mon Jun 04 22:28:19 2007 +0000 +++ b/src/DLD-FUNCTIONS/symrcm.cc Mon Jun 04 22:44:32 2007 +0000 @@ -454,7 +454,7 @@ octave_idx_type& qt, const CMK_Node& o) { Q[qt] = o; - qt = (qt + 1) % N; + qt = (qt + 1) % (N + 1); } inline static CMK_Node @@ -462,7 +462,7 @@ octave_idx_type &qt) { CMK_Node r = Q[qh]; - qh = (qh + 1) % N; + qh = (qh + 1) % (N + 1); return r; }