# HG changeset patch # User John W. Eaton # Date 1243509779 14400 # Node ID 2ed8d2d92507c09791fddc491588846e72932283 # Parent 02b16eeb3167876e7beef434f64867cf0d395c06 load_path::do_files: avoid shadow warning from GCC diff --git a/src/ChangeLog b/src/ChangeLog --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2009-05-28 John W. Eaton + + * load-path.cc (load_path::do_files): Avoid shadow warning from GCC. + 2009-05-27 John W. Eaton * DLD-FUNCTIONS/__magick_read__.cc (write_image): diff --git a/src/load-path.cc b/src/load-path.cc --- 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) {