# HG changeset patch # User jwe # Date 1095353192 0 # Node ID a0e7231a58eb481c9c976316ecdda7ca12883028 # Parent d894b803ccb5eab816bb65629cf247870da9cec8 [project @ 2004-09-16 16:44:44 by jwe] diff --git a/scripts/ChangeLog b/scripts/ChangeLog --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2004-09-15 David Bateman + + * general/bitget.m: Replace Bmax, which is undefined with bitmax + 2004-09-15 John W. Eaton * strings/strcmp.m: Fix typo in cell/string array case. diff --git a/scripts/general/bitget.m b/scripts/general/bitget.m --- a/scripts/general/bitget.m +++ b/scripts/general/bitget.m @@ -35,7 +35,7 @@ endif if (isa (A, "double")) - Amax = log2 (Bmax) + 1; + Amax = log2 (bitmax) + 1; _conv = @double; else if (isa (A, "uint8")) diff --git a/src/oct-map.cc b/src/oct-map.cc --- a/src/oct-map.cc +++ b/src/oct-map.cc @@ -124,7 +124,7 @@ { Octave_map::const_iterator pb = rb.seek (ra.key(pa)); - if (pa == rb.end ()) + if (pb == rb.end ()) { error ("field name mismatch in structure concatenation"); break;