summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2014-03-30 12:39:02 +0000
committerAlex Valavanis <valavanisalex@gmail.com>2014-03-30 12:39:02 +0000
commitc238cf70cf7cd2b3ad6e347076e15d74304294c2 (patch)
tree6feb9ac3fd6abe1c3c197f159116fa249c4a7bb8 /src
parentFix some mismatched tags (diff)
downloadinkscape-c238cf70cf7cd2b3ad6e347076e15d74304294c2.tar.gz
inkscape-c238cf70cf7cd2b3ad6e347076e15d74304294c2.zip
End support for obsolete GNU hash. Supported either natively, through TR1 or Boost now
Fixed bugs: - https://launchpad.net/bugs/1269346 (bzr r13231)
Diffstat (limited to 'src')
-rw-r--r--src/util/unordered-containers.h31
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