Mercurial > octave

diff libinterp/octave-value/ov-class.cc @ 22871:50495eeb5df1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. * ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-java.cc, ov-usr-fcn.cc, ovl.cc: Use C++ range feature to simplify for loops with iterators.
author Rik <rik@octave.org>
date Thu, 08 Dec 2016 06:55:30 -0800
parents 3a2b891d0b33
children 9baa19102908
line wrap: on
line diff
--- a/libinterp/octave-value/ov-class.cc	Tue Dec 06 12:40:45 2016 -0500
+++ b/libinterp/octave-value/ov-class.cc	Thu Dec 08 06:55:30 2016 -0800
@@ -824,11 +824,11 @@
 
   size_t retval = 0;
 
-  for (octave_map::const_iterator p = map.begin (); p != map.end (); p++)
+  for (octave_map::const_iterator it = map.begin (); it != map.end (); it++)
     {
-      std::string key = map.key (p);
+      std::string key = map.key (it);
 
-      octave_value val = octave_value (map.contents (p));
+      octave_value val = octave_value (map.contents (it));
 
       retval += val.byte_size ();
     }
@@ -869,11 +869,9 @@
     retval = this;
   else
     {
-      for (std::list<std::string>::iterator pit = parent_list.begin ();
-           pit != parent_list.end ();
-           pit++)
+      for (auto& par : parent_list)
         {
-          octave_map::const_iterator smap = map.seek (*pit);
+          octave_map::const_iterator smap = map.seek (par);
 
           const Cell& tmp = map.contents (smap);
 
@@ -900,11 +898,9 @@
     retval = this;
   else
     {
-      for (std::list<std::string>::iterator pit = parent_list.begin ();
-           pit != parent_list.end ();
-           pit++)
+      for (auto& par : parent_list)
         {
-          octave_map::iterator smap = map.seek (*pit);
+          octave_map::iterator smap = map.seek (par);
 
           Cell& tmp = map.contents (smap);
 
@@ -938,11 +934,9 @@
     retval = true;
   else
     {
-      for (std::list<std::string>::const_iterator pit = parent_list.begin ();
-           pit != parent_list.end ();
-           pit++)
+      for (auto& par : parent_list)
         {
-          octave_map::const_iterator smap = map.seek (*pit);
+          octave_map::const_iterator smap = map.seek (par);
 
           const Cell& tmp = map.contents (smap);
 
@@ -1129,10 +1123,10 @@
   std::string dbgstr = "dork";
 
   // First, check to see if there might be an issue with inheritance.
-  for (octave_map::const_iterator p = map.begin (); p != map.end (); p++)
+  for (octave_map::const_iterator it = map.begin (); it != map.end (); it++)
     {
-      std::string key = map.key (p);
-      Cell        val = map.contents (p);
+      std::string key = map.key (it);
+      Cell        val = map.contents (it);
       if (val(0).is_object ())
         {
           dbgstr = "blork";
@@ -1156,12 +1150,10 @@
         {
           octave_class::exemplar_info exmplr = it->second;
           parent_list = exmplr.parents ();
-          for (std::list<std::string>::iterator pit = parent_list.begin ();
-               pit != parent_list.end ();
-               pit++)
+          for (auto& par : parent_list)
             {
-              dbgstr = *pit;
-              bool dbgbool = map.contains (*pit);
+              dbgstr = par;
+              bool dbgbool = map.contains (par);
               if (! dbgbool)
                 {
                   retval = false;