diff options
| author | Ted Gould <ted@gould.cx> | 2012-11-25 19:41:24 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-11-25 19:41:24 +0000 |
| commit | 18be0e5e3ab74823043e19dd6ea46c4b6b130e86 (patch) | |
| tree | a62925ec4473c1a21e1c99d1415f4cccab59b432 /src/libcola | |
| parent | Getting all the filter headers (diff) | |
| parent | Fix for 1036059 : Keyboard shortcut editor (diff) | |
| download | inkscape-18be0e5e3ab74823043e19dd6ea46c4b6b130e86.tar.gz inkscape-18be0e5e3ab74823043e19dd6ea46c4b6b130e86.zip | |
Update to current trunk
(bzr r11804.1.8)
Diffstat (limited to 'src/libcola')
| -rw-r--r-- | src/libcola/connected_components.cpp | 2 | ||||
| -rw-r--r-- | src/libcola/shortest_paths.cpp | 4 | ||||
| -rw-r--r-- | src/libcola/straightener.cpp | 2 |
3 files changed, 4 insertions, 4 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) { diff --git a/src/libcola/shortest_paths.cpp b/src/libcola/shortest_paths.cpp index ebc2c93de..514721fb5 100644 --- a/src/libcola/shortest_paths.cpp +++ b/src/libcola/shortest_paths.cpp @@ -33,7 +33,7 @@ void floyd_warshall( } } } -void dijkstra_init(Node* vs, vector<Edge>& es, double* eweights) { +static void dijkstra_init(Node* vs, vector<Edge>& es, double* eweights) { for(unsigned i=0;i<es.size();i++) { unsigned u=es[i].first, v=es[i].second; vs[u].neighbours.push_back(&vs[v]); @@ -42,7 +42,7 @@ void dijkstra_init(Node* vs, vector<Edge>& es, double* eweights) { vs[v].nweights.push_back(eweights[i]); } } -void dijkstra( +static void dijkstra( unsigned s, unsigned n, Node* vs, diff --git a/src/libcola/straightener.cpp b/src/libcola/straightener.cpp index 0ecd82faa..650f41aac 100644 --- a/src/libcola/straightener.cpp +++ b/src/libcola/straightener.cpp @@ -109,7 +109,7 @@ namespace straightener { Event(EventType t, Edge *e, double p) : type(t),v(NULL),e(e),pos(p) {}; }; Event **events; - int compare_events(const void *a, const void *b) { + static int compare_events(const void *a, const void *b) { Event *ea=*(Event**)a; Event *eb=*(Event**)b; if((ea->v!=NULL&&ea->v==eb->v)||(ea->e!=NULL&&ea->e==eb->e)) { |