remaining g++ 4.3 compilation fix-ups

diff --git a/src/display/nr-filter-slot.cpp b/src/display/nr-filter-slot.cpp
index 0cbf88e02181d12027a24ab0c572872eaf644f01..76beb12f5065b53a5a2a88f08300779acdce01d0 100644 (file)
--- 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 56d3a257e2e61e40852cf6e483d836a43608360c..3a57f8e4e3f099e99f03fd2602e08749219f6810 100644 (file)
--- 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 94078c211b757b889cae027609cca3bc59a1ba4b..6071a60ad74fee3068adf192af12e04efe181374 100644 (file)
--- 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 95914313808ab59dce30bf76900cc86483f019da..b790f2bb54f788597596c82e5ac30424b856ce80 100644 (file)
--- 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 2a38836cd7146617450376d1cc7f256f10674489..34005e79199fa17ffcc5cb1cdcf910bb792ded4d 100644 (file)
--- 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 b16693356219a769f3ba84c9b6b4425284b6ec94..2902a8858f854b66295091456616ccc2ca719d94 100644 (file)
--- 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 3d105dfd094bb915bb66d60af7a3f67fe01dc831..c2fc7ff4202c49892b5253fc58335e26b04ef1f4 100644 (file)
--- 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 e2ea7c7fed4f56242edf4a36611eebd84de64740..9e685771bff872fc6cf17dee51fc3ce069d99c0c 100644 (file)
--- 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 7b5a24d538da89a342898f6535613d92aa2353e2..b9159dc4082bf9f405600ec0ac6c0e72a2edff7c 100644 (file)
--- 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"