Mercurial > hg > octave-max
changeset 11045:cc3aad9dd3ef
dispatch.cc, fltk_backend.cc, regexp.cc: use octave_scalar_map instead of Octave_map
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 29 Sep 2010 03:39:56 -0400 |
| parents | 757249bb4888 |
| children | 14993c9e857e |
| files | src/ChangeLog src/DLD-FUNCTIONS/dispatch.cc src/DLD-FUNCTIONS/fltk_backend.cc src/DLD-FUNCTIONS/regexp.cc |
| diffstat | 4 files changed, 18 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2010-09-29 John W. Eaton <jwe@octave.org> + + * DLD-FUNCTIONS/dispatch.cc (Fdispatch): Use octave_scalar_map + instead of Octave_map. + * DLD-FUNCTIONS/fltk_backend.cc (plot_window::handle): Likewise. + * DLD-FUNCTIONS/regexp.cc (octregexp): Likewise. + 2010-09-29 John W. Eaton <jwe@octave.org> * DLD-FUNCTIONS/eigs.cc (Feigs): Use octave_scalar_map instead
--- a/src/DLD-FUNCTIONS/dispatch.cc +++ b/src/DLD-FUNCTIONS/dispatch.cc @@ -156,7 +156,7 @@ p++; } - Octave_map m; + octave_scalar_map m; m.assign ("type", type_field); m.assign ("name", name_field);
--- a/src/DLD-FUNCTIONS/fltk_backend.cc +++ b/src/DLD-FUNCTIONS/fltk_backend.cc @@ -649,10 +649,10 @@ int key_a = key2ascii (key); if (key_a && fp.get_keypressfcn ().is_defined ()) { - Octave_map evt; - evt.assign ("Character", octave_value (key_a)); - evt.assign ("Key", octave_value (std::tolower (key_a))); - evt.assign ("Modifier", octave_value (modifier2cell ())); + octave_scalar_map evt; + evt.assign ("Character", key_a); + evt.assign ("Key", std::tolower (key_a)); + evt.assign ("Modifier", modifier2cell ()); fp.execute_keypressfcn (evt); } switch (key) @@ -691,10 +691,10 @@ int key_a = key2ascii (key); if (key_a && fp.get_keyreleasefcn ().is_defined ()) { - Octave_map evt; - evt.assign ("Character", octave_value (key_a)); - evt.assign ("Key", octave_value (std::tolower (key_a))); - evt.assign ("Modifier", octave_value (modifier2cell ())); + octave_scalar_map evt; + evt.assign ("Character", key_a); + evt.assign ("Key", std::tolower (key_a)); + evt.assign ("Modifier", modifier2cell ()); fp.execute_keyreleasefcn (evt); } }
--- a/src/DLD-FUNCTIONS/regexp.cc +++ b/src/DLD-FUNCTIONS/regexp.cc @@ -587,7 +587,7 @@ octave_idx_type i = 0; #ifdef HAVE_PCRE - Octave_map nmap; + octave_scalar_map nmap; if (sz == 1) { for (int j = 0; j < named.length(); j++) @@ -607,7 +607,7 @@ retval(5) = nmap; } #else - retval(5) = Octave_map(); + retval(5) = octave_scalar_map (); #endif if (once)