From e99fcbe58ef7533da06ee4658a4ee2cde4df58ea Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 3 Feb 2011 16:55:17 -0700 Subject: Bulk move libs-gui to boost unordered containers --- vcl/win/inc/salgdi.h | 4 ++-- vcl/win/source/app/salinfo.cxx | 6 +++--- vcl/win/source/gdi/winlayout.cxx | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'vcl/win') diff --git a/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h index 488ef2b1074e..c99a24d33d60 100644 --- a/vcl/win/inc/salgdi.h +++ b/vcl/win/inc/salgdi.h @@ -36,7 +36,7 @@ #include #include "boost/scoped_ptr.hpp" -#include +#include class ImplFontSelectData; class ImplWinFontEntry; @@ -119,7 +119,7 @@ private: #ifdef GNG_VERT_HACK void ReadGsubTable( HDC ) const; - typedef std::hash_set UcsHashSet; + typedef boost::unordered_set UcsHashSet; mutable UcsHashSet maGsubTable; mutable bool mbGsubRead; public: diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 2280fd6e0ddf..e25d1b8a52e4 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -58,7 +58,7 @@ #include "rtl/ustrbuf.hxx" -#include +#include SalSystem* WinSalInstance::CreateSalSystem() { @@ -143,7 +143,7 @@ bool WinSalSystem::initMonitors() DISPLAY_DEVICEW aDev; aDev.cb = sizeof( aDev ); DWORD nDevice = 0; - std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; + boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDeviceStringCount; while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) ) { if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE) @@ -169,7 +169,7 @@ bool WinSalSystem::initMonitors() EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast(this) ); // append monitor numbers to name strings - std::hash_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); + boost::unordered_map< rtl::OUString, int, rtl::OUStringHash > aDevCount( aDeviceStringCount ); unsigned int nMonitors = m_aMonitors.size(); for( unsigned int i = 0; i < nMonitors; i++ ) { diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx index c4e85bb17de8..cd15389af818 100644 --- a/vcl/win/source/gdi/winlayout.cxx +++ b/vcl/win/source/gdi/winlayout.cxx @@ -65,10 +65,10 @@ #undef ULONG #endif // USE_UNISCRIBE -#include +#include #include -typedef std::hash_map IntMap; +typedef boost::unordered_map IntMap; typedef std::set IntSet; // Graphite headers -- cgit