Mercurial > octave-nkf
changeset 5005:62da6b854fdb
[project @ 2004-09-17 01:57:41 by jwe]
| author | jwe |
|---|---|
| date | Fri, 17 Sep 2004 01:57:41 +0000 |
| parents | efa1ba94dab5 |
| children | 2bcd013bc867 |
| files | src/ChangeLog src/symtab.cc |
| diffstat | 2 files changed, 12 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Sep 16 19:04:20 2004 +0000 +++ b/src/ChangeLog Fri Sep 17 01:57:41 2004 +0000 @@ -1,5 +1,7 @@ 2004-09-16 John W. Eaton <jwe@octave.org> + * symtab.cc (maybe_list): Count sizes using size_t, not int. + * variables.cc (symbol_out_of_date): Always look in LOADPATH. 2004-09-15 John W. Eaton <jwe@octave.org>
--- a/src/symtab.cc Thu Sep 16 19:04:20 2004 +0000 +++ b/src/symtab.cc Fri Sep 17 01:57:41 2004 +0000 @@ -1522,7 +1522,11 @@ if (len > 0) { - int bytes = 0, elements = 0, i; + size_t bytes = 0; + size_t elements = 0; + + int i; + std::list<whos_parameter> params; // Joining symbolic tables. @@ -1549,9 +1553,11 @@ bytes += symbols(j)->byte_size (); } - os << "\nTotal is " << elements - << " element" << ((elements > 1) ? "s" : "") << " using " - << bytes << " byte" << ((bytes > 1) ? "s" : "") << "\n"; + os << "\nTotal is " + << elements << (elements > 1 ? " elements" : "element") + << " using " + << bytes << (bytes > 1 ? " bytes" : "byte") + << "\n"; status = 1; }