Mercurial > octave

diff libinterp/corefcn/load-path.cc @ 25337:3ff9192b676e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use auto keyword to declare iterator variables where possible * dialog.cc, files-dock-widget.cc, history-dock-widget.cc, file-editor.cc, octave-qt-link.cc, call-stack.cc, debug.cc, dynamic-ld.cc, fcn-info.cc, fcn-info.h, genprops.awk, graphics.cc, gtk-manager.cc, gtk-manager.h, hook-fcn.h, load-path.cc, load-save.cc, ls-mat5.cc, mex.cc, oct-map.cc, oct-stream.cc, octave-link.cc, regexp.cc, symscope.h, symtab.h, txt-eng.h, url-handle-manager.cc, variables.cc, ov-base.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-java.cc, ov-struct.cc, bp-table.cc, jit-ir.cc, jit-typeinfo.cc, pt-arg-list.cc, pt-arg-list.h, pt-array-list.cc, pt-check.cc, pt-classdef.cc, pt-decl.h, pt-eval.cc, pt-idx.cc, pt-jit.cc, pt-misc.cc, pt-pr-code.cc, pt-select.h, pt-stmt.h, caseless-str.h, lo-regexp.cc: Use auto keyword to declare iterator variables where possible. Style fixes.
author John W. Eaton <jwe@octave.org>
date Wed, 02 May 2018 01:36:20 -0400
parents 078b795c5219
children 416856765a55
line wrap: on
line diff
--- a/libinterp/corefcn/load-path.cc	Wed May 02 00:30:00 2018 -0400
+++ b/libinterp/corefcn/load-path.cc	Wed May 02 01:36:20 2018 -0400
@@ -338,7 +338,7 @@
 
             dir = strip_trailing_separators (dir);
 
-            dir_info_list_iterator i = find_dir_info (dir);
+            auto i = find_dir_info (dir);
 
             if (i != dir_info_list.end ())
               {
@@ -747,7 +747,7 @@
   {
     string_vector retval;
 
-    const_dir_info_list_iterator p = find_dir_info (dir);
+    auto p = find_dir_info (dir);
 
     if (p != dir_info_list.end ())
       retval = p->fcn_files;
@@ -852,7 +852,7 @@
   {
     std::string dir = sys::file_ops::tilde_expand (dir_arg);
 
-    const_dir_info_list_iterator retval = dir_info_list.begin ();
+    auto retval = dir_info_list.begin ();
 
     while (retval != dir_info_list.end ())
       {
@@ -870,7 +870,7 @@
   {
     std::string dir = sys::file_ops::tilde_expand (dir_arg);
 
-    dir_info_list_iterator retval = dir_info_list.begin ();
+    auto retval = dir_info_list.begin ();
 
     while (retval != dir_info_list.end ())
       {
@@ -940,7 +940,7 @@
 
     dir = strip_trailing_separators (dir);
 
-    dir_info_list_iterator i = find_dir_info (dir);
+    auto i = find_dir_info (dir);
 
     if (i != dir_info_list.end ())
       move (i, at_end);
@@ -1131,7 +1131,7 @@
               {
                 std::string abs_name = sys::env::make_absolute (dir_name);
 
-                const_abs_dir_cache_iterator p = abs_dir_cache.find (abs_name);
+                auto p = abs_dir_cache.find (abs_name);
 
                 if (p != abs_dir_cache.end ())
                   {
@@ -1190,7 +1190,7 @@
         std::string name_head = name.substr (0, pos);
         std::string name_tail = name.substr (pos + 1);
 
-        const_package_dir_map_iterator it = package_dir_map.find (name_head);
+        auto it = package_dir_map.find (name_head);
 
         if (it != package_dir_map.end ())
           return it->second.is_package (name_tail);
@@ -1343,8 +1343,7 @@
   {
     std::string dir_name = di.dir_name;
 
-    std::list<std::string>::iterator s =
-      std::find (dir_list.begin (), dir_list.end (), dir_name);
+    auto s = std::find (dir_list.begin (), dir_list.end (), dir_name);
 
     if (s != dir_list.end ())
       {
@@ -1472,7 +1471,7 @@
       {
         dir_name = "";
 
-        const_fcn_map_iterator p = fcn_map.find (fcn);
+        auto p = fcn_map.find (fcn);
 
         if (p != fcn_map.end ())
           {
@@ -1506,13 +1505,13 @@
 
     //  update ();
 
-    const_private_fcn_map_iterator q = private_fcn_map.find (dir);
+    auto q = private_fcn_map.find (dir);
 
     if (q != private_fcn_map.end ())
       {
         const dir_info::fcn_file_map_type& m = q->second;
 
-        dir_info::const_fcn_file_map_iterator p = m.find (fcn);
+        auto p = m.find (fcn);
 
         if (p != m.end ())
           {
@@ -1540,13 +1539,13 @@
 
     dir_name = "";
 
-    const_method_map_iterator q = method_map.find (class_name);
+    auto q = method_map.find (class_name);
 
     if (q != method_map.end ())
       {
         const fcn_map_type& m = q->second;
 
-        const_fcn_map_iterator p = m.find (meth);
+        auto p = m.find (meth);
 
         if (p != m.end ())
           {
@@ -1580,7 +1579,7 @@
 
     //  update ();
 
-    const_method_map_iterator mtd_map_it = method_map.find (class_name);
+    auto mtd_map_it = method_map.find (class_name);
 
     if (mtd_map_it != method_map.end ())
       {
@@ -1656,7 +1655,7 @@
 
         file_info_list_type& file_info_list = fcn_map[base];
 
-        file_info_list_iterator p = file_info_list.begin ();
+        auto p = file_info_list.begin ();
 
         while (p != file_info_list.end ())
           {
@@ -1773,7 +1772,7 @@
 
             file_info_list_type& file_info_list = fm[base];
 
-            file_info_list_iterator p2 = file_info_list.begin ();
+            auto p2 = file_info_list.begin ();
             while (p2 != file_info_list.end ())
               {
                 if (p2->dir_name == full_dir_name)
@@ -1943,7 +1942,7 @@
   void
   load_path::package_info::remove_private_fcn_map (const std::string& dir)
   {
-    private_fcn_map_iterator p = private_fcn_map.find (dir);
+    auto p = private_fcn_map.find (dir);
 
     if (p != private_fcn_map.end ())
       private_fcn_map.erase (p);
@@ -2422,7 +2421,7 @@
       for (auto dir : dir_elts)
         {
           // Remove duplicate directory separators
-          std::string::iterator it_start = dir.begin ();
+          auto it_start = dir.begin ();
 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
           // In Windows, start check at second character (for UNC paths).
           it_start++;