summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-05-15 22:17:53 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-05-15 22:17:53 +0000
commit76e9bb52fbd6a39e68cd8e34559762e2b2d1806b (patch)
tree74321bd02fa33195a4c455da2d1508f181dece61
parentfix compile warning (diff)
downloadinkscape-76e9bb52fbd6a39e68cd8e34559762e2b2d1806b.tar.gz
inkscape-76e9bb52fbd6a39e68cd8e34559762e2b2d1806b.zip
fix C++11 compilation
(bzr r13341.1.30)
-rw-r--r--src/live_effects/lpe-vonkoch.cpp3
-rw-r--r--src/ui/tool/node.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/live_effects/lpe-vonkoch.cpp b/src/live_effects/lpe-vonkoch.cpp
index c0050fa60..8b0b716fe 100644
--- a/src/live_effects/lpe-vonkoch.cpp
+++ b/src/live_effects/lpe-vonkoch.cpp
@@ -4,11 +4,10 @@
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-#include <cstdio>
+#include "live_effects/lpe-vonkoch.h"
#include <glibmm/i18n.h>
-#include "live_effects/lpe-vonkoch.h"
#include <2geom/transforms.h>
//using std::vector;
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index 5971956e1..101af4817 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -41,6 +41,7 @@ template <typename> class NodeIterator;
}
}
+/*
#if HAVE_TR1_UNORDERED_SET
namespace std {
namespace tr1 {
@@ -48,6 +49,8 @@ template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
}
}
#endif
+#endif
+*/
namespace Inkscape {
namespace UI {