summaryrefslogtreecommitdiffstats
path: root/src/libcola/connected_components.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2012-11-26 06:56:29 +0000
committer~suv <suv-sf@users.sourceforge.net>2012-11-26 06:56:29 +0000
commit0f140e037d3b84ca7664c9a18b5bd977b912d6c2 (patch)
tree559b8b9215dcf4a688a480ae1dc3f557d3036d05 /src/libcola/connected_components.cpp
parentmerge from trunk (r11871) (diff)
parentFix undo history entry for layer renaming to be consistent with 'Rename Layer... (diff)
downloadinkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.tar.gz
inkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.zip
merge from trunk (r11903)
(bzr r11668.1.42)
Diffstat (limited to 'src/libcola/connected_components.cpp')
-rw-r--r--src/libcola/connected_components.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcola/connected_components.cpp b/src/libcola/connected_components.cpp
index 0cf6ee45a..1afec55b4 100644
--- a/src/libcola/connected_components.cpp
+++ b/src/libcola/connected_components.cpp
@@ -39,7 +39,7 @@ namespace cola {
Rectangle* r;
};
// Depth first search traversal of graph to find connected component
- void dfs(Node* v,
+ static void dfs(Node* v,
list<Node*>& remaining,
Component* component,
map<unsigned,pair<Component*,unsigned> > &cmap) {