diff options
-rw-r--r-- | l10ntools/inc/tagtest.hxx | 2 | ||||
-rw-r--r-- | sot/source/sdstor/stgcache.cxx | 2 | ||||
-rw-r--r-- | unotools/inc/unotools/atom.hxx | 4 | ||||
-rw-r--r-- | unotools/source/config/pathoptions.cxx | 2 | ||||
-rw-r--r-- | unotools/source/misc/atom.cxx | 20 | ||||
-rw-r--r-- | vcl/aqua/inc/saldata.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/vcl/graphite_cache.hxx | 4 | ||||
-rw-r--r-- | vcl/source/gdi/outdev3.cxx | 4 | ||||
-rw-r--r-- | vcl/source/glyphs/gcach_ftyp.cxx | 2 |
9 files changed, 22 insertions, 22 deletions
diff --git a/l10ntools/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx index a348cb870cc1..87d413f1a10a 100644 --- a/l10ntools/inc/tagtest.hxx +++ b/l10ntools/inc/tagtest.hxx @@ -58,7 +58,7 @@ struct lessByteString{ struct hashByteString{ size_t operator()( const ByteString& rName ) const{ - std::hash< const char* > myHash; + boost::hash< const char* > myHash; return myHash( rName.GetBuffer() ); } }; diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx index 4087bdb77a24..ffee054f7257 100644 --- a/sot/source/sdstor/stgcache.cxx +++ b/sot/source/sdstor/stgcache.cxx @@ -54,7 +54,7 @@ typedef boost::unordered_map < INT32, StgPage *, - std::hash< INT32 >, + boost::hash< INT32 >, std::equal_to< INT32 > > UsrStgPagePtr_Impl; #ifdef _MSC_VER diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx index 9a6acbbbb023..c6cff2529343 100644 --- a/unotools/inc/unotools/atom.hxx +++ b/unotools/inc/unotools/atom.hxx @@ -50,7 +50,7 @@ namespace utl { class AtomProvider { int m_nAtoms; - ::boost::unordered_map< int, ::rtl::OUString, ::std::hash< int > > m_aStringMap; + ::boost::unordered_map< int, ::rtl::OUString, ::boost::hash< int > > m_aStringMap; ::boost::unordered_map< ::rtl::OUString, int, ::rtl::OUStringHash > m_aAtomMap; public: AtomProvider(); @@ -72,7 +72,7 @@ namespace utl { class UNOTOOLS_DLLPUBLIC MultiAtomProvider { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > > m_aAtomLists; + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > > m_aAtomLists; public: MultiAtomProvider(); ~MultiAtomProvider(); diff --git a/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx index 1715a0e5ea5f..ca0e5501cc14 100644 --- a/unotools/source/config/pathoptions.cxx +++ b/unotools/source/config/pathoptions.cxx @@ -112,7 +112,7 @@ class NameToHandleMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int inline void free() { NameToHandleMap().swap( *this ); } }; -class EnumToHandleMap : public ::boost::unordered_map< sal_Int32, sal_Int32, std::hash< sal_Int32 >, std::equal_to< sal_Int32 > > +class EnumToHandleMap : public ::boost::unordered_map< sal_Int32, sal_Int32, boost::hash< sal_Int32 >, std::equal_to< sal_Int32 > > { public: inline void free() { EnumToHandleMap().swap( *this ); } diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx index c0070d18ebb8..d8bf5bbfa053 100644 --- a/unotools/source/misc/atom.cxx +++ b/unotools/source/misc/atom.cxx @@ -95,7 +95,7 @@ void AtomProvider::getRecent( int atom, ::std::list< ::utl::AtomDescription >& a const ::rtl::OUString& AtomProvider::getString( int nAtom ) const { static ::rtl::OUString aEmpty; - ::boost::unordered_map< int, ::rtl::OUString, ::std::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); + ::boost::unordered_map< int, ::rtl::OUString, ::boost::hash< int > >::const_iterator it = m_aStringMap.find( nAtom ); return it == m_aStringMap.end() ? aEmpty : it->second; } @@ -121,14 +121,14 @@ MultiAtomProvider::MultiAtomProvider() MultiAtomProvider::~MultiAtomProvider() { - for( ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it ) + for( ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.begin(); it != m_aAtomLists.end(); ++it ) delete it->second; } sal_Bool MultiAtomProvider::insertAtomClass( int atomClass ) { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it = + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return sal_False; @@ -138,7 +138,7 @@ sal_Bool MultiAtomProvider::insertAtomClass( int atomClass ) int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, sal_Bool bCreate ) { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::iterator it = + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getAtom( rString, bCreate ); @@ -154,7 +154,7 @@ int MultiAtomProvider::getAtom( int atomClass, const ::rtl::OUString& rString, s int MultiAtomProvider::getLastAtom( int atomClass ) const { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); return it != m_aAtomLists.end() ? it->second->getLastAtom() : INVALID_ATOM; @@ -162,7 +162,7 @@ int MultiAtomProvider::getLastAtom( int atomClass ) const void MultiAtomProvider::getRecent( int atomClass, int atom, ::std::list< ::utl::AtomDescription >& atoms ) { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) it->second->getRecent( atom, atoms ); @@ -172,7 +172,7 @@ void MultiAtomProvider::getRecent( int atomClass, int atom, ::std::list< ::utl:: const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) const { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) return it->second->getString( atom ); @@ -183,13 +183,13 @@ const ::rtl::OUString& MultiAtomProvider::getString( int atomClass, int atom ) c sal_Bool MultiAtomProvider::hasAtom( int atomClass, int atom ) const { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); return it != m_aAtomLists.end() ? it->second->hasAtom( atom ) : sal_False; } void MultiAtomProvider::getClass( int atomClass, ::std::list< ::utl::AtomDescription >& atoms) const { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it != m_aAtomLists.end() ) it->second->getAll( atoms ); @@ -199,7 +199,7 @@ void MultiAtomProvider::getClass( int atomClass, ::std::list< ::utl::AtomDescrip void MultiAtomProvider::overrideAtom( int atomClass, int atom, const ::rtl::OUString& description ) { - ::boost::unordered_map< int, AtomProvider*, ::std::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); + ::boost::unordered_map< int, AtomProvider*, ::boost::hash< int > >::const_iterator it = m_aAtomLists.find( atomClass ); if( it == m_aAtomLists.end() ) m_aAtomLists[ atomClass ] = new AtomProvider(); m_aAtomLists[ atomClass ]->overrideAtom( atom, description ); diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx index fb4a2e19a05b..ef5adced5506 100644 --- a/vcl/aqua/inc/saldata.hxx +++ b/vcl/aqua/inc/saldata.hxx @@ -71,10 +71,10 @@ class SystemFontList; // ----------- class AquaSalFrame; -struct FrameHash : public std::hash<sal_IntPtr> +struct FrameHash : public boost::hash<sal_IntPtr> { size_t operator()(const AquaSalFrame* frame) const - { return std::hash<sal_IntPtr>::operator()( reinterpret_cast<const sal_IntPtr>(frame) ); } + { return boost::hash<sal_IntPtr>::operator()( reinterpret_cast<const sal_IntPtr>(frame) ); } }; #define INVALID_CURSOR_PTR (NSCursor*)0xdeadbeef diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx index 3c73f6f9484c..ecf667fdbaaf 100644 --- a/vcl/inc/vcl/graphite_cache.hxx +++ b/vcl/inc/vcl/graphite_cache.hxx @@ -96,7 +96,7 @@ private: friend class GraphiteSegmentCache; }; -typedef boost::unordered_map<long, GrSegRecord*, std::hash<long> > GraphiteSegMap; +typedef boost::unordered_map<long, GrSegRecord*, boost::hash<long> > GraphiteSegMap; typedef boost::unordered_multimap<size_t, GrSegRecord*> GraphiteRopeMap; typedef std::pair<GraphiteRopeMap::iterator, GraphiteRopeMap::iterator> GrRMEntry; @@ -230,7 +230,7 @@ private: const xub_Unicode * m_prevKey; }; -typedef boost::unordered_map<int, GraphiteSegmentCache *, std::hash<int> > GraphiteCacheMap; +typedef boost::unordered_map<int, GraphiteSegmentCache *, boost::hash<int> > GraphiteCacheMap; /** * GraphiteCacheHandler maps a particular font, style, size to a GraphiteSegmentCache diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 709bdc012c57..1d2eb329614b 100644 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -996,8 +996,8 @@ ImplFontEntry::~ImplFontEntry() size_t ImplFontEntry::GFBCacheKey_Hash::operator()( const GFBCacheKey& rData ) const { - std::hash<sal_UCS4> a; - std::hash<int > b; + boost::hash<sal_UCS4> a; + boost::hash<int > b; return a(rData.first) ^ b(rData.second); } diff --git a/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx index 5c0dff72703f..29db43e3b4c6 100644 --- a/vcl/source/glyphs/gcach_ftyp.cxx +++ b/vcl/source/glyphs/gcach_ftyp.cxx @@ -136,7 +136,7 @@ FT_Error (*pFTOblique)(FT_GlyphSlot); static bool bEnableSizeFT = false; struct EqStr{ bool operator()(const char* a, const char* b) const { return !strcmp(a,b); } }; -typedef ::boost::unordered_map<const char*,FtFontFile*,::std::hash<const char*>, EqStr> FontFileList; +typedef ::boost::unordered_map<const char*,FtFontFile*,::boost::hash<const char*>, EqStr> FontFileList; namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } // ----------------------------------------------------------------------- |