summaryrefslogtreecommitdiffstats
path: root/src/libcola/cycle_detector.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
committerMartin Owens <doctormo@gmail.com>2014-03-27 01:33:44 +0000
commit5a4fb2325f60d292b47330f540b26a3279341c90 (patch)
treed2aa7967be25450b83e625025366c618101ae49f /src/libcola/cycle_detector.cpp
parentThe Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff)
parentRemove Snap menu item and improve grid menu item text (diff)
downloadinkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz
inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/libcola/cycle_detector.cpp')
-rw-r--r--src/libcola/cycle_detector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcola/cycle_detector.cpp b/src/libcola/cycle_detector.cpp
index 89a2ccaae..11e24a0ba 100644
--- a/src/libcola/cycle_detector.cpp
+++ b/src/libcola/cycle_detector.cpp
@@ -53,7 +53,7 @@ void CycleDetector::make_matrix() {
assert(traverse.empty());
// from the edges passed, fill the adjacency matrix
- for (ei = edges->begin(); ei != edges->end(); ei++) {
+ for (ei = edges->begin(); ei != edges->end(); ++ei) {
anEdge = *ei;
// the matrix is indexed by the first vertex of the edge
// the second vertex of the edge is pushed onto another
@@ -241,7 +241,7 @@ bool CycleDetector::find_node(std::vector<Node *> *& list, unsigned k) {
}
pair< bool, vector<unsigned>::iterator > CycleDetector::find_node(std::vector<unsigned>& list, unsigned k) {
- for (vector<unsigned>::iterator ti = traverse.begin(); ti != traverse.end(); ti++) {
+ for (vector<unsigned>::iterator ti = traverse.begin(); ti != traverse.end(); ++ti) {
if (*ti == k) { return pair< bool, vector<unsigned>::iterator >(true, ti); }
}