diff options
| author | Kees Cook <kees@outflux.net> | 2008-02-11 08:10:22 +0000 |
|---|---|---|
| committer | keescook <keescook@users.sourceforge.net> | 2008-02-11 08:10:22 +0000 |
| commit | 1ef8d2e18f14491e114d6ade4238c74616e248d2 (patch) | |
| tree | 3bc92fc31827a05f8056d76f15407149b6e55b28 /src | |
| parent | Upate translation for Khmer (diff) | |
| download | inkscape-1ef8d2e18f14491e114d6ade4238c74616e248d2.tar.gz inkscape-1ef8d2e18f14491e114d6ade4238c74616e248d2.zip | |
remaining g++ 4.3 compilation fix-ups
(bzr r4706)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/nr-filter-slot.cpp | 1 | ||||
| -rw-r--r-- | src/libavoid/makepath.cpp | 2 | ||||
| -rw-r--r-- | src/libnr/nr-maybe.h | 1 | ||||
| -rw-r--r-- | src/livarot/float-line.cpp | 1 | ||||
| -rw-r--r-- | src/live_effects/lpeobject-reference.cpp | 2 | ||||
| -rw-r--r-- | src/syseq.h | 1 | ||||
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.h | 2 | ||||
| -rw-r--r-- | src/widgets/ruler.h | 2 | ||||
| -rw-r--r-- | src/xml/composite-node-observer.h | 1 |
9 files changed, 11 insertions, 2 deletions
diff --git a/src/display/nr-filter-slot.cpp b/src/display/nr-filter-slot.cpp index 0cbf88e02..76beb12f5 100644 --- a/src/display/nr-filter-slot.cpp +++ b/src/display/nr-filter-slot.cpp @@ -14,6 +14,7 @@ */ #include <assert.h> +#include <string.h> #include "display/nr-arena-item.h" #include "display/nr-filter-types.h" diff --git a/src/libavoid/makepath.cpp b/src/libavoid/makepath.cpp index 56d3a257e..3a57f8e4e 100644 --- a/src/libavoid/makepath.cpp +++ b/src/libavoid/makepath.cpp @@ -273,7 +273,7 @@ static void dijkstraPath(ConnRef *lineRef, VertInf *src, VertInf *tar) { Router *router = src->_router; - double unseen = (double) INT_MAX; + double unseen = (double) __INT_MAX__; // initialize arrays VertInf *finish = router->vertices.end(); diff --git a/src/libnr/nr-maybe.h b/src/libnr/nr-maybe.h index 94078c211..6071a60ad 100644 --- a/src/libnr/nr-maybe.h +++ b/src/libnr/nr-maybe.h @@ -15,6 +15,7 @@ #include <stdexcept> #include <string> +#include <algorithm> namespace NR { diff --git a/src/livarot/float-line.cpp b/src/livarot/float-line.cpp index 959143138..b790f2bb5 100644 --- a/src/livarot/float-line.cpp +++ b/src/livarot/float-line.cpp @@ -12,6 +12,7 @@ #ifdef faster_flatten # include <cmath> // std::abs(float) #endif +#include <stdio.h> #include "livarot/float-line.h" #include "livarot/int-line.h" #include <cstdio> diff --git a/src/live_effects/lpeobject-reference.cpp b/src/live_effects/lpeobject-reference.cpp index 2a38836cd..34005e791 100644 --- a/src/live_effects/lpeobject-reference.cpp +++ b/src/live_effects/lpeobject-reference.cpp @@ -6,6 +6,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information. */ +#include <string.h> + #include "enums.h" #include "live_effects/lpeobject-reference.h" #include "live_effects/lpeobject.h" diff --git a/src/syseq.h b/src/syseq.h index b16693356..2902a8858 100644 --- a/src/syseq.h +++ b/src/syseq.h @@ -12,6 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include <algorithm> #include <iostream> #include <iomanip> #include <vector> diff --git a/src/ui/dialog/filter-effects-dialog.h b/src/ui/dialog/filter-effects-dialog.h index 3d105dfd0..c2fc7ff42 100644 --- a/src/ui/dialog/filter-effects-dialog.h +++ b/src/ui/dialog/filter-effects-dialog.h @@ -12,6 +12,8 @@ #ifndef INKSCAPE_UI_DIALOG_FILTER_EFFECTS_H #define INKSCAPE_UI_DIALOG_FILTER_EFFECTS_H +#include <memory> + #include <gtkmm/adjustment.h> #include <gtkmm/alignment.h> #include <gtkmm/box.h> diff --git a/src/widgets/ruler.h b/src/widgets/ruler.h index e2ea7c7fe..9e685771b 100644 --- a/src/widgets/ruler.h +++ b/src/widgets/ruler.h @@ -15,7 +15,7 @@ #include <gtk/gtkruler.h> #include "sp-metric.h" - +#include <iostream> #include <glib.h> diff --git a/src/xml/composite-node-observer.h b/src/xml/composite-node-observer.h index 7b5a24d53..b9159dc40 100644 --- a/src/xml/composite-node-observer.h +++ b/src/xml/composite-node-observer.h @@ -15,6 +15,7 @@ #ifndef SEEN_INKSCAPE_XML_COMPOSITE_NODE_OBSERVER_H #define SEEN_INKSCAPE_XML_COMPOSITE_NODE_OBSERVER_H +#include <glib/gtestutils.h> #include "gc-managed.h" #include "xml/node-observer.h" #include "util/list-container.h" |