Mercurial > hg > octave-nkf
diff src/ov-class.h @ 10768:8a868004a437
use octave_map for octave_class
| author | Jaroslav Hajek <highegg@gmail.com> |
|---|---|
| date | Wed, 07 Jul 2010 10:57:52 +0200 |
| parents | 604e13a89c7f |
| children | f687bd17ce21 |
line wrap: on
line diff
--- a/src/ov-class.h +++ b/src/ov-class.h @@ -52,14 +52,14 @@ octave_class (void) : octave_base_value (), obsolete_copies (0) { } - octave_class (const Octave_map& m, const std::string& id) + octave_class (const octave_map& m, const std::string& id) : octave_base_value (), map (m), c_name (id), obsolete_copies (0) { } octave_class (const octave_class& s) : octave_base_value (s), map (s.map), c_name (s.c_name), parent_list (s.parent_list), obsolete_copies (0) { } - octave_class (const Octave_map& m, const std::string& id, + octave_class (const octave_map& m, const std::string& id, const octave_value_list& parents); ~octave_class (void) { } @@ -70,7 +70,7 @@ octave_base_value *empty_clone (void) const { - return new octave_class (Octave_map (map.keys ()), class_name ()); + return new octave_class (octave_map (map.keys ()), class_name ()); } Cell dotref (const octave_value_list& idx); @@ -122,7 +122,7 @@ { return map.reshape (new_dims); } octave_value resize (const dim_vector& dv, bool = false) const - { Octave_map tmap = map; tmap.resize (dv); return tmap; } + { octave_map tmap = map; tmap.resize (dv); return tmap; } bool is_defined (void) const { return true; } @@ -132,8 +132,6 @@ octave_map map_value (void) const { return map; } - Octave_map old_map_value (void) const { return map; } - string_vector map_keys (void) const; std::list<std::string> parent_class_name_list (void) const @@ -180,7 +178,7 @@ private: - Octave_map map; + octave_map map; DECLARE_OCTAVE_ALLOCATOR