Mercurial > hg > octave-thorsten

changeset 14980:f10cddda37c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
omit warning for multiple Contents.m files in the load path * load-path.cc (load_path::add_to_fcn_map): Don't warn about multiple Contents.m files in the load path.
author John W. Eaton <jwe@octave.org>
date Thu, 19 Jul 2012 15:18:19 -0400
parents f20312fc9046
children cca0a52be4fa
files src/load-path.cc
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/load-path.cc
+++ b/src/load-path.cc
@@ -1798,7 +1798,11 @@
                   // way we look for old.dir_name in sys_path to avoid
                   // partial matches?
 
-                  if (sys_path.find (old.dir_name) != std::string::npos
+                  // Don't warn about Contents.m files since we expect
+                  // more than one to exist in the load path.
+
+                  if (fname != "Contents.m"
+                      && sys_path.find (old.dir_name) != std::string::npos
                       && in_path_list (sys_path, old.dir_name))
                     {
                       std::string fcn_path = file_ops::concat (dir_name, fname);