diff options
Diffstat (limited to 'sal/inc/osl/diagnose.hxx')
-rw-r--r-- | sal/inc/osl/diagnose.hxx | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx index ca249508f061..a9aba130d72b 100644 --- a/sal/inc/osl/diagnose.hxx +++ b/sal/inc/osl/diagnose.hxx @@ -43,7 +43,7 @@ #if ! defined(_RTL_INSTANCE_HXX_) #include "rtl/instance.hxx" #endif -#include <hash_set> +#include <boost/unordered_set.hpp> #include <functional> #include <typeinfo> @@ -96,22 +96,8 @@ struct VoidPtrHash : ::std::unary_function<void const*, ::std::size_t> { } }; -#ifdef USE_MSVC_HASH_SET -namespace stdext -{ - inline ::std::size_t hash_value( void const* p ) { - ::std::size_t const d = static_cast< ::std::size_t >( - reinterpret_cast< ::std::ptrdiff_t >(p) ); - return d + (d >> 3); - } -} - -typedef ::std::hash_set<void const*, ::std::hash_compare<void const *>, +typedef ::boost::unordered_set<void const*, VoidPtrHash, ::std::equal_to<void const*>, ::rtl::Allocator<void const*> > VoidPointerSet; -#else -typedef ::std::hash_set<void const*, VoidPtrHash, ::std::equal_to<void const*>, - ::rtl::Allocator<void const*> > VoidPointerSet; -#endif struct ObjectRegistryData { ObjectRegistryData( ::std::type_info const& rTypeInfo ) |