From d90e476bb66c9102a3cb17e1c0de5ccd340d9005 Mon Sep 17 00:00:00 2001 From: rgheck Date: Mon, 9 Nov 2009 02:26:01 +0000 Subject: [PATCH] Cleanup. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31912 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/Graph.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Graph.cpp b/src/Graph.cpp index 78e9f27954..fe0f28aa5c 100644 --- a/src/Graph.cpp +++ b/src/Graph.cpp @@ -22,7 +22,7 @@ namespace lyx { bool Graph::bfs_init(int s, bool clear_visited) { - if (s < 0 || s >= vertices_.size()) + if (s < 0) return false; Q_ = queue(); @@ -45,14 +45,14 @@ Graph::getReachableTo(int target, bool clear_visited) return result; while (!Q_.empty()) { - int const i = Q_.front(); + int const current = Q_.front(); Q_.pop(); - if (i != target || formats.get(target).name() != "lyx") { - result.push_back(i); + if (current != target || formats.get(target).name() != "lyx") { + result.push_back(current); } - vector::iterator it = vertices_[i].in_vertices.begin(); - vector::iterator end = vertices_[i].in_vertices.end(); + vector::iterator it = vertices_[current].in_vertices.begin(); + vector::iterator end = vertices_[current].in_vertices.end(); for (; it != end; ++it) { if (!visited_[*it]) { visited_[*it] = true; @@ -106,7 +106,7 @@ bool Graph::isReachable(int from, int to) if (from == to) return true; - if (to < 0 || to >= vertices_.size() || !bfs_init(from)) + if (to < 0 || !bfs_init(from)) return false; while (!Q_.empty()) { @@ -137,7 +137,7 @@ Graph::EdgePath const Graph::getPath(int from, int to) if (from == to) return path; - if (to < 0 || to >= vertices_.size() || !bfs_init(from)) + if (to < 0 || !bfs_init(from)) return path; vector prev_edge(formats.size()); -- 2.11.4.GIT