C++11: signal: Use auto for iterators.

murraycu · murraycu · commit 05b5a81d7880 · 2016-04-02T09:03:05.000+02:00
diff --git a/sigc++/macros/signal.h.m4 b/sigc++/macros/signal.h.m4
@@ -138,7 +138,7 @@ FOR(1, $1,[
       //This avoids a leak on MSVC++ - see http://bugzilla.gnome.org/show_bug.cgi?id=306249
       { 
         temp_slot_list slots(impl->slots_);
-        iterator_type it = slots.begin();
+        auto it = slots.begin();
         for (; it != slots.end(); ++it)
           if (!it->empty() && !it->blocked()) break;
           
@@ -234,7 +234,7 @@ FOR(1, $1,[
       signal_exec exec(impl);
       temp_slot_list slots(impl->slots_);
 
-      for (iterator_type it = slots.begin(); it != slots.end(); ++it)
+      for (auto it = slots.begin(); it != slots.end(); ++it)
         {
           if (it->empty() || it->blocked())
             continue;
@@ -262,7 +262,7 @@ FOR(1, $1,[
       typedef std::reverse_iterator<signal_impl::iterator_type, std::random_access_iterator_tag,
                                      slot_base, slot_base&, slot_base*, std::ptrdiff_t> reverse_iterator_type;
 #endif
-      for (reverse_iterator_type it = reverse_iterator_type(slots.end()); it != reverse_iterator_type(slots.begin()); ++it)
+      for (auto it = reverse_iterator_type(slots.end()); it != reverse_iterator_type(slots.begin()); ++it)
         {
           if (it->empty() || it->blocked())
             continue;
@@ -1126,7 +1126,7 @@ struct slot_reverse_iterator_buf
 
   result_type operator*() const
     {
-      iterator_type __tmp(i_);
+      auto __tmp(i_);
 	  --__tmp;
       if (!__tmp->empty() && !__tmp->blocked() && !invoked_)
         {
@@ -1205,7 +1205,7 @@ struct slot_reverse_iterator_buf<T_emitter, void>
 
   void operator*() const
     {
-      iterator_type __tmp(i_);
+      auto __tmp(i_);
 	  --__tmp;
 	  if (!__tmp->empty() && !__tmp->blocked() && !invoked_)
         {

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ FOR(1, $1,[`
`138`	`138`	`//This avoids a leak on MSVC++ - see http://bugzilla.gnome.org/show_bug.cgi?id=306249`
`139`	`139`	`{`
`140`	`140`	`temp_slot_list slots(impl->slots_);`
`141`		`- iterator_type it = slots.begin();`
	`141`	`+ auto it = slots.begin();`
`142`	`142`	`for (; it != slots.end(); ++it)`
`143`	`143`	`if (!it->empty() && !it->blocked()) break;`
`144`	`144`
`@@ -234,7 +234,7 @@ FOR(1, $1,[`
`234`	`234`	`signal_exec exec(impl);`
`235`	`235`	`temp_slot_list slots(impl->slots_);`
`236`	`236`
`237`		`- for (iterator_type it = slots.begin(); it != slots.end(); ++it)`
	`237`	`+ for (auto it = slots.begin(); it != slots.end(); ++it)`
`238`	`238`	`{`
`239`	`239`	`if (it->empty() \|\| it->blocked())`
`240`	`240`	`continue;`
`@@ -262,7 +262,7 @@ FOR(1, $1,[`
`262`	`262`	`typedef std::reverse_iterator<signal_impl::iterator_type, std::random_access_iterator_tag,`
`263`	`263`	`slot_base, slot_base&, slot_base*, std::ptrdiff_t> reverse_iterator_type;`
`264`	`264`	`#endif`
`265`		`- for (reverse_iterator_type it = reverse_iterator_type(slots.end()); it != reverse_iterator_type(slots.begin()); ++it)`
	`265`	`+ for (auto it = reverse_iterator_type(slots.end()); it != reverse_iterator_type(slots.begin()); ++it)`
`266`	`266`	`{`
`267`	`267`	`if (it->empty() \|\| it->blocked())`
`268`	`268`	`continue;`
`@@ -1126,7 +1126,7 @@ struct slot_reverse_iterator_buf`
`1126`	`1126`
`1127`	`1127`	`result_type operator*() const`
`1128`	`1128`	`{`
`1129`		`- iterator_type __tmp(i_);`
	`1129`	`+ auto __tmp(i_);`
`1130`	`1130`	`--__tmp;`
`1131`	`1131`	`if (!__tmp->empty() && !__tmp->blocked() && !invoked_)`
`1132`	`1132`	`{`
`@@ -1205,7 +1205,7 @@ struct slot_reverse_iterator_buf<T_emitter, void>`
`1205`	`1205`
`1206`	`1206`	`void operator*() const`
`1207`	`1207`	`{`
`1208`		`- iterator_type __tmp(i_);`
	`1208`	`+ auto __tmp(i_);`
`1209`	`1209`	`--__tmp;`
`1210`	`1210`	`if (!__tmp->empty() && !__tmp->blocked() && !invoked_)`
`1211`	`1211`	`{`