From 3dba448bb3de902323019b4378a152864c6a9a73 Mon Sep 17 00:00:00 2001 From: mental Date: Sun, 18 Mar 2007 18:39:34 +0000 Subject: [PATCH] add required includes for gcc 4.3 and fix a const issue -- patch #1675635 from mellum (Falk Hueffner) --- src/composite-undo-stack-observer.cpp | 1 + src/debug/demangle.cpp | 2 +- src/dialogs/unclump.cpp | 1 + src/libavoid/makepath.cpp | 2 ++ src/libavoid/visibility.cpp | 1 + src/libnrtype/Layout-TNG.h | 1 + src/remove-last.h | 1 + src/sp-item-update-cns.cpp | 1 + src/svg/itos.cpp | 1 + 9 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/composite-undo-stack-observer.cpp b/src/composite-undo-stack-observer.cpp index 3c46cb11e..85d7aed13 100644 --- 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 #include "composite-undo-stack-observer.h" #include "xml/event.h" diff --git a/src/debug/demangle.cpp b/src/debug/demangle.cpp index 79d0275bf..0da7cfd63 100644 --- 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 a15e17bc7..eb5870d2e 100644 --- a/src/dialogs/unclump.cpp +++ b/src/dialogs/unclump.cpp @@ -11,6 +11,7 @@ */ +#include #include #include "libnr/nr-matrix-ops.h" #include "sp-item.h" diff --git a/src/libavoid/makepath.cpp b/src/libavoid/makepath.cpp index 746e530bc..9a4f7beaa 100644 --- 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 #include +#include #include namespace Avoid { diff --git a/src/libavoid/visibility.cpp b/src/libavoid/visibility.cpp index f540baf21..58df94d92 100644 --- a/src/libavoid/visibility.cpp +++ b/src/libavoid/visibility.cpp @@ -21,6 +21,7 @@ */ +#include #include #include "libavoid/shape.h" diff --git a/src/libnrtype/Layout-TNG.h b/src/libnrtype/Layout-TNG.h index 3eed1fc43..63a48e562 100755 --- a/src/libnrtype/Layout-TNG.h +++ b/src/libnrtype/Layout-TNG.h @@ -17,6 +17,7 @@ #include "libnr/nr-rotate-ops.h" #include #include +#include #include #ifdef HAVE_CAIRO_PDF diff --git a/src/remove-last.h b/src/remove-last.h index 4d5df3f54..094f57cc2 100644 --- a/src/remove-last.h +++ b/src/remove-last.h @@ -1,6 +1,7 @@ #ifndef __REMOVE_LAST_H__ #define __REMOVE_LAST_H__ +#include #include #include diff --git a/src/sp-item-update-cns.cpp b/src/sp-item-update-cns.cpp index e1857dcca..528129fb9 100644 --- a/src/sp-item-update-cns.cpp +++ b/src/sp-item-update-cns.cpp @@ -3,6 +3,7 @@ #include "sp-guide-constraint.h" #include #include +#include using std::find; using std::vector; diff --git a/src/svg/itos.cpp b/src/svg/itos.cpp index 9b1232130..ee49f5014 100644 --- a/src/svg/itos.cpp +++ b/src/svg/itos.cpp @@ -14,6 +14,7 @@ ///////////////////////////////////////////////////////////////////////// // Standard include files +#include #include // for string using namespace std; -- 2.30.2