[folks] core: Eliminate a shadowed variable
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] core: Eliminate a shadowed variable
- Date: Fri, 25 Oct 2013 11:01:06 +0000 (UTC)
commit b4ecf27b56ee09e42e7a4619f88988cb52d6db2e
Author: Philip Withnall <philip withnall collabora co uk>
Date: Fri Oct 25 11:58:58 2013 +0100
core: Eliminate a shadowed variable
Vala is fine with this but GCC complains. Let’s keep GCC happy.
folks/individual-aggregator.vala | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/folks/individual-aggregator.vala b/folks/individual-aggregator.vala
index b82b29c..1815145 100644
--- a/folks/individual-aggregator.vala
+++ b/folks/individual-aggregator.vala
@@ -1715,12 +1715,12 @@ public class Folks.IndividualAggregator : Object
/* Extract the deprecated added and removed sets from
* individuals_changes, to be used in the individuals_changed
* signal. */
- var iter = individuals_changes.map_iterator ();
+ var iter1 = individuals_changes.map_iterator ();
- while (iter.next ())
+ while (iter1.next ())
{
- var old_ind = iter.get_key ();
- var new_ind = iter.get_value ();
+ var old_ind = iter1.get_key ();
+ var new_ind = iter1.get_value ();
assert (old_ind != null || new_ind != null);
@@ -1748,11 +1748,11 @@ public class Folks.IndividualAggregator : Object
/* Signal the replacement of various Individuals as a consequence of
* linking. */
debug ("Replacing Individuals due to linking:");
- var iter = replaced_individuals.map_iterator ();
- while (iter.next () == true)
+ var iter2 = replaced_individuals.map_iterator ();
+ while (iter2.next () == true)
{
- var old_ind = iter.get_key ();
- var new_ind = iter.get_value ();
+ var old_ind = iter2.get_key ();
+ var new_ind = iter2.get_value ();
debug (" %s (%p) → %s (%p)", old_ind.id, old_ind,
new_ind.id, new_ind);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]