summaryrefslogtreecommitdiffstats
path: root/src/graphlayout.cpp
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-07-02 12:08:37 +0000
committerCampbell Barton <ideasman42@gmail.com>2011-07-02 12:08:37 +0000
commit353dc258f73b43bbd6b49d1c4331facd45bfd773 (patch)
tree2def4c0330aeef810df47cc7ebe36a6496e11574 /src/graphlayout.cpp
parentadded missing header (diff)
downloadinkscape-353dc258f73b43bbd6b49d1c4331facd45bfd773.tar.gz
inkscape-353dc258f73b43bbd6b49d1c4331facd45bfd773.zip
compatibility for building with clang, this failed for 2 reasons.
- redefining the variable 'i' - the comparison between iterators didn't work. double checked this is the only use of shadowed 'i' so this has no functional changes. (bzr r10398)
Diffstat (limited to '')
-rw-r--r--src/graphlayout.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/graphlayout.cpp b/src/graphlayout.cpp
index 4f536beb3..2717c376a 100644
--- a/src/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -156,11 +156,12 @@ void graphlayout(GSList const *const items) {
++i)
{
SPItem *iu=*i;
- map<string,unsigned>::iterator i=nodelookup.find(iu->getId());
- if(i==nodelookup.end()) {
+ map<string,unsigned>::iterator i_iter=nodelookup.find(iu->getId());
+ map<string,unsigned>::iterator i_iter_end=nodelookup.end();
+ if(i_iter==i_iter_end) {
continue;
}
- unsigned u=i->second;
+ unsigned u=i_iter->second;
GSList *nlist=iu->avoidRef->getAttachedConnectors(Avoid::runningFrom);
list<SPItem *> connectors;