Mercurial > octave-nkf
changeset 9188:9646be3a59c4
make changeset 1e5c11890f85 work
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 07 May 2009 17:47:39 -0400 |
| parents | a3237ae32c0d |
| children | 8a348e4be8bb |
| files | src/ChangeLog src/graphics.h.in |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu May 07 16:43:03 2009 -0400 +++ b/src/ChangeLog Thu May 07 17:47:39 2009 -0400 @@ -1,5 +1,11 @@ 2009-05-07 John W. Eaton <jwe@octave.org> + * graphics.h.in (base_graphics_object::set): Undo previous change. + (base_properties::set (const caseless_str&, const octave_value&): + New virtual function. + (base_properties::set (const caseless_str&, const std::string&, + const octave_value&)): No longer virtual. + * toplev.cc (octave_config_info): Remove F2C and F2CFLAGS from the config infor struct. * oct-conf.h.in (OCTAVE_CONF_F2CFLAGS, OCTAVE_CONF_F2C):
--- a/src/graphics.h.in Thu May 07 16:43:03 2009 -0400 +++ b/src/graphics.h.in Thu May 07 17:47:39 2009 -0400 @@ -1642,8 +1642,13 @@ all_props[name] = p; } - virtual void set (const caseless_str& pname, const std::string& cname, - const octave_value& val); + virtual void set (const caseless_str&, const octave_value&) + { + panic_impossible (); + } + + void set (const caseless_str& pname, const std::string& cname, + const octave_value& val); virtual octave_value get (const caseless_str& pname) const; @@ -1828,7 +1833,7 @@ virtual void set (const caseless_str& pname, const octave_value& pval) { if (valid_object ()) - get_properties ().set (pname, type (), pval); + get_properties ().set (pname, pval); else error ("base_graphics_object::set: invalid graphics object"); }