diff options
| author | MenTaLguY <mental@rydia.net> | 2007-03-18 18:39:34 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2007-03-18 18:39:34 +0000 |
| commit | 59fe6ab99727a1a58abc9c85096022fd8797ff44 (patch) | |
| tree | 38e32e15f49da5f5bccf70ed5f0494600fd183fd /src | |
| parent | fix 64-bit issues with width of npos -- patch #1675697 from mellum (diff) | |
| download | inkscape-59fe6ab99727a1a58abc9c85096022fd8797ff44.tar.gz inkscape-59fe6ab99727a1a58abc9c85096022fd8797ff44.zip | |
add required includes for gcc 4.3 and fix a const issue -- patch #1675635
from mellum (Falk Hueffner)
(bzr r2696)
Diffstat (limited to 'src')
| -rw-r--r-- | src/composite-undo-stack-observer.cpp | 1 | ||||
| -rw-r--r-- | src/debug/demangle.cpp | 2 | ||||
| -rw-r--r-- | src/dialogs/unclump.cpp | 1 | ||||
| -rw-r--r-- | src/libavoid/makepath.cpp | 2 | ||||
| -rw-r--r-- | src/libavoid/visibility.cpp | 1 | ||||
| -rwxr-xr-x | src/libnrtype/Layout-TNG.h | 1 | ||||
| -rw-r--r-- | src/remove-last.h | 1 | ||||
| -rw-r--r-- | src/sp-item-update-cns.cpp | 1 | ||||
| -rw-r--r-- | src/svg/itos.cpp | 1 |
9 files changed, 10 insertions, 1 deletions
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 <algorithm> #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 <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 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 <algorithm> #include <vector> +#include <limits.h> #include <math.h> 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 <algorithm> #include <cfloat> #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 <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 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 <algorithm> #include <vector> #include <glib.h> 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 <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 9b1232130..ee49f5014 100644 --- 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; |