Mercurial > octave-nkf
changeset 4252:20e70f7f1dbe
[project @ 2002-12-31 17:41:02 by jwe]
| author | jwe |
|---|---|
| date | Tue, 31 Dec 2002 17:41:02 +0000 |
| parents | 48fb5cec5d77 |
| children | c3acf8a967fa |
| files | src/ChangeLog src/ov.h |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Dec 31 15:47:46 2002 +0000 +++ b/src/ChangeLog Tue Dec 31 17:41:02 2002 +0000 @@ -1,3 +1,9 @@ +2002-12-31 John W. Eaton <jwe@bevo.che.wisc.edu> + + * ov.h (DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA): Delete volatile + qualifier for decls of static_type_id and t_id. + (DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA): Likewise, for def of t_id. + 2002-12-30 John W. Eaton <jwe@bevo.che.wisc.edu> * utils.cc (Ffile_in_path): Index args correctly.
--- a/src/ov.h Tue Dec 31 15:47:46 2002 +0000 +++ b/src/ov.h Tue Dec 31 17:41:02 2002 +0000 @@ -658,16 +658,16 @@ public: \ int type_id (void) const { return t_id; } \ std::string type_name (void) const { return t_name; } \ - static volatile int static_type_id (void) { return t_id; } \ + static int static_type_id (void) { return t_id; } \ static void register_type (void) \ { t_id = octave_value_typeinfo::register_type (t_name); } \ \ private: \ - static volatile int t_id; \ + static int t_id; \ static const std::string t_name; #define DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(t, n) \ - volatile int t::t_id (-1); \ + int t::t_id (-1); \ const std::string t::t_name (n) // If TRUE, allow assignments like