Import of pkgsrc-2015Q1

This commit is contained in:
2015-04-22 14:34:26 +02:00
committed by Lionel Sambuc
parent 9a8c06dafb
commit 4af1cdf7a9
25114 changed files with 870550 additions and 795435 deletions

View File

@@ -1,28 +1,16 @@
$NetBSD: patch-src_ui_tool_node.h,v 1.1 2014/01/11 17:48:52 wiz Exp $
$NetBSD: patch-src_ui_tool_node.h,v 1.3 2015/02/03 13:55:12 adam Exp $
--- src/ui/tool/node.h.orig 2012-02-14 03:22:17.000000000 +0000
--- src/ui/tool/node.h.orig 2014-11-30 18:45:32.000000000 +0000
+++ src/ui/tool/node.h
@@ -16,7 +16,9 @@
#include <iosfwd>
@@ -21,11 +21,7 @@
#include <stdexcept>
#include <cstddef>
-#if __cplusplus >= 201103L
#include <functional>
-#else
-#include <tr1/functional>
+
+#include <functional>
+
#include <boost/utility.hpp>
-#endif
#include <boost/enable_shared_from_this.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
@@ -32,12 +34,6 @@ template <typename> class NodeIterator;
}
}
-namespace std {
-namespace tr1 {
-template <typename N> struct hash< Inkscape::UI::NodeIterator<N> >;
-}
-}
-
namespace Inkscape {
namespace UI {