add required includes for gcc 4.3 and fix a const issue -- patch #1675635

from mellum (Falk Hueffner)

diff --git a/src/composite-undo-stack-observer.cpp b/src/composite-undo-stack-observer.cpp
index 3c46cb11e1ef0a8cf8d9966db156f42cdc23a930..85d7aed13242d58f4706c892a18c7ec6e1562aee 100644 (file)
--- a/src/composite-undo-stack-observer.cpp
+++ b/src/composite-undo-stack-observer.cpp
@@ -11,6 +11,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#include <algorithm>
 
 #include "composite-undo-stack-observer.h"
 #include "xml/event.h"

diff --git a/src/debug/demangle.cpp b/src/debug/demangle.cpp
index 79d0275bf7242cca3bca803cf90b318b266218c8..0da7cfd635f83fd8dbb0b045d33a8c7a3e045273 100644 (file)
--- a/src/debug/demangle.cpp
+++ b/src/debug/demangle.cpp
@@ -40,7 +40,7 @@ char const *demangle_helper(char const *name) {
 }
 
 struct string_less_than {
-    bool operator()(char const *a, char const *b) {
+    bool operator()(char const *a, char const *b) const {
         return ( strcmp(a, b) < 0 );
     }
 };

diff --git a/src/dialogs/unclump.cpp b/src/dialogs/unclump.cpp
index a15e17bc7c49fcda71a149a77d1ecfb814d1a986..eb5870d2eb77f51dea44c9dcc4e2c7451862f784 100644 (file)
--- a/src/dialogs/unclump.cpp
+++ b/src/dialogs/unclump.cpp
@@ -11,6 +11,7 @@
  */
 
 
+#include <algorithm>
 #include <map>
 #include "libnr/nr-matrix-ops.h"
 #include "sp-item.h"

diff --git a/src/libavoid/makepath.cpp b/src/libavoid/makepath.cpp
index 746e530bc1f5a5c118dac0127a838f8e893cb77f..9a4f7beaac28eb9dd9cbf2263d9b351c960aa0d3 100644 (file)
--- a/src/libavoid/makepath.cpp
+++ b/src/libavoid/makepath.cpp
@@ -31,7 +31,9 @@
 #include "libavoid/connector.h"
 #include "libavoid/graph.h"
 #include "libavoid/router.h"
+#include <algorithm>
 #include <vector>
+#include <limits.h>
 #include <math.h>
 
 namespace Avoid {

diff --git a/src/libavoid/visibility.cpp b/src/libavoid/visibility.cpp
index f540baf219793db47bd5255ec48dbee303e305c8..58df94d9272b7c600db7a2535ffb77dcd637375b 100644 (file)
--- a/src/libavoid/visibility.cpp
+++ b/src/libavoid/visibility.cpp
@@ -21,6 +21,7 @@
 */
 
 
+#include <algorithm>
 #include <cfloat>
 
 #include "libavoid/shape.h"

diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h
index 3eed1fc43d2eb67aa728e19a9d2605c7dd888592..63a48e562e121b1652e17acaec56204e20972ee3 100755 (executable)
--- a/src/libnrtype/Layout-TNG.h
+++ b/src/libnrtype/Layout-TNG.h
@@ -17,6 +17,7 @@
 #include "libnr/nr-rotate-ops.h"
 #include <glibmm/ustring.h>
 #include <pango/pango-break.h>
+#include <algorithm>
 #include <vector>
 
 #ifdef HAVE_CAIRO_PDF

diff --git a/src/remove-last.h b/src/remove-last.h
index 4d5df3f548e9386004915b4626c42eaec43e2ed3..094f57cc2a5112d473824b89db994d0eba6e2b79 100644 (file)
--- a/src/remove-last.h
+++ b/src/remove-last.h
@@ -1,6 +1,7 @@
 #ifndef __REMOVE_LAST_H__
 #define __REMOVE_LAST_H__
 
+#include <algorithm>
 #include <vector>
 #include <glib.h>
 

diff --git a/src/sp-item-update-cns.cpp b/src/sp-item-update-cns.cpp
index e1857dcca21383dc47f5f5889d7a74f4d38c80ad..528129fb999859411d22f191888365441d4e7d90 100644 (file)
--- a/src/sp-item-update-cns.cpp
+++ b/src/sp-item-update-cns.cpp
@@ -3,6 +3,7 @@
 #include "sp-guide-constraint.h"
 #include <sp-guide.h>
 #include <sp-item.h>
+#include <algorithm>
 using std::find;
 using std::vector;
 

diff --git a/src/svg/itos.cpp b/src/svg/itos.cpp
index 9b12321300f69c8d86a50a81173ca8f3a398507b..ee49f501425a9e65d695fe1f81192bf69fe895d2 100644 (file)
--- a/src/svg/itos.cpp
+++ b/src/svg/itos.cpp
@@ -14,6 +14,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 // Standard include files
+#include <algorithm>
 #include <string>              // for string
 
 using namespace std;