diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-07-14 05:30:15 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-07-14 05:30:15 +0000 |
| commit | 4d9217f4f7b6e5b11f88af486e8659f539dc1300 (patch) | |
| tree | 4e554ba1a27ff9ef8d3d3299cca9eb303c73a726 /src/libavoid/graph.h | |
| parent | fixed warnings (diff) | |
| download | inkscape-4d9217f4f7b6e5b11f88af486e8659f539dc1300.tar.gz inkscape-4d9217f4f7b6e5b11f88af486e8659f539dc1300.zip | |
* src/sp-conn-end-pair.cpp, src/connector-context.cpp,
src/document.cpp, src/libavoid/*:
Update libavoid with upstream fixes, optimisations and new features.
(bzr r1411)
Diffstat (limited to 'src/libavoid/graph.h')
| -rw-r--r-- | src/libavoid/graph.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libavoid/graph.h b/src/libavoid/graph.h index 92451f205..c4de3df08 100644 --- a/src/libavoid/graph.h +++ b/src/libavoid/graph.h @@ -27,7 +27,6 @@ #include <cassert> #include <list> #include <utility> -using std::pair; #include "libavoid/vertices.h" namespace Avoid { @@ -55,8 +54,8 @@ class EdgeInf void addCycleBlocker(void); void addBlocker(int b); - pair<VertID, VertID> ids(void); - pair<Point, Point> points(void); + std::pair<VertID, VertID> ids(void); + std::pair<Point, Point> points(void); void db_print(void); void checkVis(void); VertInf *otherVert(VertInf *vert); |