diff options
| author | su_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 |
| commit | 0f140e037d3b84ca7664c9a18b5bd977b912d6c2 (patch) | |
| tree | 559b8b9215dcf4a688a480ae1dc3f557d3036d05 /src/libavoid | |
| parent | merge from trunk (r11871) (diff) | |
| parent | Fix undo history entry for layer renaming to be consistent with 'Rename Layer... (diff) | |
| download | inkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.tar.gz inkscape-0f140e037d3b84ca7664c9a18b5bd977b912d6c2.zip | |
merge from trunk (r11903)
(bzr r11668.1.42)
Diffstat (limited to 'src/libavoid')
| -rw-r--r-- | src/libavoid/makepath.cpp | 2 | ||||
| -rw-r--r-- | src/libavoid/orthogonal.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libavoid/makepath.cpp b/src/libavoid/makepath.cpp index 4e15dbca9..774e0d7f5 100644 --- a/src/libavoid/makepath.cpp +++ b/src/libavoid/makepath.cpp @@ -82,7 +82,7 @@ class ANode // it back into a heap) when getting the next node to examine. This way we // get better complexity -- logarithmic pushs and pops to the heap. // -bool operator<(const ANode &a, const ANode &b) +static bool operator<(const ANode &a, const ANode &b) { if (a.f != b.f) { diff --git a/src/libavoid/orthogonal.cpp b/src/libavoid/orthogonal.cpp index e0a30b246..772fc9668 100644 --- a/src/libavoid/orthogonal.cpp +++ b/src/libavoid/orthogonal.cpp @@ -204,7 +204,7 @@ class ShiftSegment }; typedef std::list<ShiftSegment> ShiftSegmentList; -bool cmpShiftSegment(const ShiftSegment& u, const ShiftSegment& v) +static bool cmpShiftSegment(const ShiftSegment& u, const ShiftSegment& v) { return u < v; } @@ -488,7 +488,7 @@ Event **events; // Used for quicksort. Must return <0, 0, or >0. -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; |