diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-02-15 13:25:54 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2006-02-15 13:25:54 +0000 |
| commit | 618fe74db3717f5c37f7a51d0d6df95776efbfe1 (patch) | |
| tree | 4c9afdc2bb436cd52cef7609d1960291433bf3c9 /src/libavoid/timer.h | |
| parent | fix svg to dxf scaling factor (diff) | |
| download | inkscape-618fe74db3717f5c37f7a51d0d6df95776efbfe1.tar.gz inkscape-618fe74db3717f5c37f7a51d0d6df95776efbfe1.zip | |
* src/document.cpp, src/document.h, src/sp-conn-end-pair.cpp,
src/connector-context.cpp, src/conn-avoid-ref.cpp:
Keep a seperate connector router for each document.
* src/libavoid/Makefile_insert, src/libavoid/connector.cpp,
src/libavoid/connector.h, src/libavoid/debug.h,
src/libavoid/geometry.cpp, src/libavoid/geometry.h,
src/libavoid/geomtypes.h, src/libavoid/graph.cpp,
src/libavoid/graph.h, src/libavoid/incremental.cpp,
src/libavoid/incremental.h, src/libavoid/libavoid.h,
src/libavoid/makepath.cpp, src/libavoid/makepath.h,
src/libavoid/polyutil.cpp, src/libavoid/polyutil.h,
src/libavoid/router.cpp, src/libavoid/router.h,
src/libavoid/shape.cpp, src/libavoid/shape.h,
src/libavoid/static.cpp, src/libavoid/static.h,
src/libavoid/timer.cpp, src/libavoid/timer.h,
src/libavoid/vertices.cpp, src/libavoid/vertices.h,
src/libavoid/visibility.cpp, src/libavoid/visibility.h:
Upstream changes to libavoid that allow multiple connector
router instances, as well a few other minor bugfixes.
(bzr r144)
Diffstat (limited to 'src/libavoid/timer.h')
| -rw-r--r-- | src/libavoid/timer.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libavoid/timer.h b/src/libavoid/timer.h index 9446ecc51..a7e6081fa 100644 --- a/src/libavoid/timer.h +++ b/src/libavoid/timer.h @@ -2,7 +2,7 @@ * vim: ts=4 sw=4 et tw=0 wm=0 * * libavoid - Fast, Incremental, Object-avoiding Line Router - * Copyright (C) 2004-2005 Michael Wybrow <mjwybrow@users.sourceforge.net> + * Copyright (C) 2004-2006 Michael Wybrow <mjwybrow@users.sourceforge.net> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -37,10 +37,10 @@ namespace Avoid { #else - #define register_timer(t) timers.Register(t) - #define regstart_timer(t) timers.Register(t, timerStart) - #define start_timer() timers.Start() - #define stop_timer() timers.Stop() + #define register_timer(t) router->timers.Register(t) + #define regstart_timer(t) router->timers.Register(t, timerStart) + #define start_timer() router->timers.Start() + #define stop_timer() router->timers.Stop() #endif @@ -85,7 +85,6 @@ class Timer int type, lasttype; }; -extern Timer timers; } |