diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-12 23:54:23 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-12 23:54:23 +0000 |
| commit | 072f4e717d42b6a70532fb755b8e31a54cd313b6 (patch) | |
| tree | c26166b179735d68a965a6be90ae320133afe012 /src/ui/tool/node.h | |
| parent | Update to trunk (diff) | |
| parent | fix C++11 compilation. There A LOT of const_casts in this file... :-( (diff) | |
| download | inkscape-072f4e717d42b6a70532fb755b8e31a54cd313b6.tar.gz inkscape-072f4e717d42b6a70532fb755b8e31a54cd313b6.zip | |
Update to trunk
(bzr r11950.1.199)
Diffstat (limited to 'src/ui/tool/node.h')
| -rw-r--r-- | src/ui/tool/node.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ui/tool/node.h b/src/ui/tool/node.h index 224d00855..d257db86a 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 { |