Mercurial > hg > octave-lyh
changeset 9282:2ed8d2d92507
load_path::do_files: avoid shadow warning from GCC
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 28 May 2009 07:22:59 -0400 |
parents | 02b16eeb3167 |
children | 38ad8c99d6a2 |
files | src/ChangeLog src/load-path.cc |
diffstat | 2 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-05-28 John W. Eaton <jwe@octave.org> + + * load-path.cc (load_path::do_files): Avoid shadow warning from GCC. + 2009-05-27 John W. Eaton <jwe@octave.org> * DLD-FUNCTIONS/__magick_read__.cc (write_image):
--- a/src/load-path.cc +++ b/src/load-path.cc @@ -1341,10 +1341,10 @@ { string_vector retval; - const_dir_info_list_iterator i = find_dir_info (dir); + const_dir_info_list_iterator p = find_dir_info (dir); - if (i != dir_info_list.end ()) - retval = i->fcn_files; + if (p != dir_info_list.end ()) + retval = p->fcn_files; if (omit_exts) {