Mercurial > octave

changeset 21862:5c67b16acc4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use C++ 'auto' keyword in some instances in liboctave. * cmd-edit.cc, cmd-edit.h, oct-shlib.cc, singleton-cleanup.cc: Use C++ 'auto' keyword in some instances in liboctave.
author Rik <rik@octave.org>
date Sat, 11 Jun 2016 15:32:31 -0700
parents a55f1fa2c94a
children a25110491607
files liboctave/util/cmd-edit.cc liboctave/util/cmd-edit.h liboctave/util/oct-shlib.cc liboctave/util/singleton-cleanup.cc
diffstat 4 files changed, 14 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/util/cmd-edit.cc	Sat Jun 11 13:13:03 2016 -0700
+++ b/liboctave/util/cmd-edit.cc	Sat Jun 11 15:32:31 2016 -0700
@@ -1090,10 +1090,9 @@
   int
   command_editor::startup_handler (void)
   {
-    for (startup_hook_set_iterator p = startup_hook_set.begin ();
-         p != startup_hook_set.end (); p++)
+    for (auto fcnptr : startup_hook_set)
       {
-        startup_hook_fcn f = *p;
+        startup_hook_fcn f = *fcnptr;
 
         if (f)
           f ();
@@ -1105,10 +1104,9 @@
   int
   command_editor::pre_input_handler (void)
   {
-    for (pre_input_hook_set_iterator p = pre_input_hook_set.begin ();
-         p != pre_input_hook_set.end (); p++)
+    for (auto fcnptr : pre_input_hook_set)
       {
-        pre_input_hook_fcn f = *p;
+        pre_input_hook_fcn f = *fcnptr;
 
         if (f)
           f ();
@@ -1126,10 +1124,9 @@
 
     event_hook_lock.unlock ();
 
-    for (event_hook_set_iterator p = hook_set.begin ();
-         p != hook_set.end (); p++)
+    for (auto fcnptr : hook_set)
       {
-        event_hook_fcn f = *p;
+        event_hook_fcn f = *fcnptr;
 
         if (f)
           f ();
@@ -1482,7 +1479,7 @@
   {
     if (instance_ok ())
       {
-        startup_hook_set_iterator p = startup_hook_set.find (f);
+        auto p = startup_hook_set.find (f);
 
         if (p != startup_hook_set.end ())
           startup_hook_set.erase (p);
@@ -1508,7 +1505,7 @@
   {
     if (instance_ok ())
       {
-        pre_input_hook_set_iterator p = pre_input_hook_set.find (f);
+        auto p = pre_input_hook_set.find (f);
 
         if (p != pre_input_hook_set.end ())
           pre_input_hook_set.erase (p);
@@ -1538,7 +1535,7 @@
 
     if (instance_ok ())
       {
-        event_hook_set_iterator p = event_hook_set.find (f);
+        auto p = event_hook_set.find (f);
 
         if (p != event_hook_set.end ())
           event_hook_set.erase (p);
--- a/liboctave/util/cmd-edit.h	Sat Jun 11 13:13:03 2016 -0700
+++ b/liboctave/util/cmd-edit.h	Sat Jun 11 15:32:31 2016 -0700
@@ -213,15 +213,6 @@
 
     static std::set<event_hook_fcn> event_hook_set;
 
-    typedef std::set<startup_hook_fcn>::iterator startup_hook_set_iterator;
-    typedef std::set<startup_hook_fcn>::const_iterator startup_hook_set_const_iterator;
-
-    typedef std::set<pre_input_hook_fcn>::iterator pre_input_hook_set_iterator;
-    typedef std::set<pre_input_hook_fcn>::const_iterator pre_input_hook_set_const_iterator;
-
-    typedef std::set<event_hook_fcn>::iterator event_hook_set_iterator;
-    typedef std::set<event_hook_fcn>::const_iterator event_hook_set_const_iterator;
-
     // The real thing.
     static command_editor *instance;
 
--- a/liboctave/util/oct-shlib.cc	Sat Jun 11 13:13:03 2016 -0700
+++ b/liboctave/util/oct-shlib.cc	Sat Jun 11 15:32:31 2016 -0700
@@ -116,7 +116,7 @@
   void
   dynamic_library::dynlib_rep::add_fcn_name (const std::string& name)
   {
-    fcn_names_iterator p = fcn_names.find (name);
+    auto p = fcn_names.find (name);
 
     if (p == fcn_names.end ())
       fcn_names[name] = 1;
@@ -129,7 +129,7 @@
   {
     bool retval = false;
 
-    fcn_names_iterator p = fcn_names.find (fcn_name);
+    auto p = fcn_names.find (fcn_name);
 
     if (p != fcn_names.end () && --(p->second) == 0)
       {
@@ -143,7 +143,7 @@
   void
   dynamic_library::dynlib_rep::do_close_hook (dynamic_library::close_hook cl_hook)
   {
-    for (fcn_names_iterator p = fcn_names.begin (); p != fcn_names.end (); p++)
+    for (auto p = fcn_names.begin (); p != fcn_names.end (); p++)
       cl_hook (p->first);
 
     fcn_names.clear ();
--- a/liboctave/util/singleton-cleanup.cc	Sat Jun 11 13:13:03 2016 -0700
+++ b/liboctave/util/singleton-cleanup.cc	Sat Jun 11 15:32:31 2016 -0700
@@ -31,10 +31,9 @@
 
 singleton_cleanup_list::~singleton_cleanup_list (void)
 {
-  for (std::set<fptr>::iterator p = fcn_list.begin ();
-       p != fcn_list.end (); p++)
+  for (auto fcnptr : fcn_list)
     {
-      fptr fcn = *p;
+      fptr fcn = *fcnptr;
 
       fcn ();
     }