From ab423632c0e41eaacd513ae874640bc32a335c11 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Tue, 12 Nov 2013 23:07:48 +0100
Subject: part of patch by David Evans to fix C++11 build

Fixed bugs:
  - https://launchpad.net/bugs/1244295

(bzr r12801)
---
 src/trace/siox.cpp | 1 +
 src/ui/tool/node.h | 8 ++++++++
 2 files changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/trace/siox.cpp b/src/trace/siox.cpp
index 92992d440..0706cfed1 100644
--- a/src/trace/siox.cpp
+++ b/src/trace/siox.cpp
@@ -11,6 +11,7 @@
 #include <stdarg.h>
 #include <map>
 #include <algorithm>
+#include <cstdlib>
 
 
 namespace org
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h
index e3fc6c2c8..b874949f5 100644
--- a/src/ui/tool/node.h
+++ b/src/ui/tool/node.h
@@ -16,7 +16,13 @@
 #include <iosfwd>
 #include <stdexcept>
 #include <cstddef>
+
+#if __cplusplus >= 201103L
+#include <functional>
+#else
 #include <tr1/functional>
+#endif
+
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/shared_ptr.hpp>
 #include "ui/tool/selectable-control-point.h"
@@ -31,11 +37,13 @@ template <typename> class NodeIterator;
 }
 }
 
+#if __cplusplus < 201103L
 namespace std {
 namespace tr1 {
 template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
 }
 }
+#endif
 
 namespace Inkscape {
 namespace UI {
-- 
cgit v1.2.3