diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-01 00:30:50 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-01 00:30:50 +0000 |
| commit | f438b6b2ed8fb3013ef75832ef0763d27aa130eb (patch) | |
| tree | 57dbdbd030a0efb418ff714992520fc23af4597a /src/util | |
| parent | Update to trunk (diff) | |
| parent | partial 2geom update: (diff) | |
| download | inkscape-f438b6b2ed8fb3013ef75832ef0763d27aa130eb.tar.gz inkscape-f438b6b2ed8fb3013ef75832ef0763d27aa130eb.zip | |
Update to trunk
(bzr r13090.1.39)
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/unordered-containers.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/util/unordered-containers.h b/src/util/unordered-containers.h index 98c2fa3c9..b92f2e7ea 100644 --- a/src/util/unordered-containers.h +++ b/src/util/unordered-containers.h @@ -69,37 +69,6 @@ struct hash<Glib::ustring> : public std::unary_function<Glib::ustring, std::size } }; } // namespace boost - -#elif defined(HAVE_EXT_HASH_SET) - -# include <functional> -# include <ext/hash_set> -# include <ext/hash_map> -# define INK_UNORDERED_SET __gnu_cxx::hash_set -# define INK_UNORDERED_MAP __gnu_cxx::hash_map -# define INK_HASH __gnu_cxx::hash - -#include <cstddef> - -namespace __gnu_cxx { -// hash function for pointers -// TR1 and Boost have this defined by default, __gnu_cxx doesn't -template<typename T> -struct hash<T *> : public std::unary_function<T *, std::size_t> { - std::size_t operator()(T *p) const { - // Taken from Boost - std::size_t x = static_cast<std::size_t>(reinterpret_cast<std::ptrdiff_t>(p)); - return x + (x >> 3); - } -}; - -template <> -struct hash<Glib::ustring> : public std::unary_function<Glib::ustring, std::size_t> { - std::size_t operator()(Glib::ustring const &s) const { - return hash<std::string>()(s.raw()); - } -}; -} // namespace __gnu_cxx #endif #else |
