diff options
| author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2011-02-03 16:55:17 -0700 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-04 01:10:15 +0100 |
| commit | e99fcbe58ef7533da06ee4658a4ee2cde4df58ea (patch) | |
| tree | 2dffe52eb92af74244d25f19613b1af187d9eab7 /vcl/win | |
| parent | fad7c8f3e0d0518b1a6411d53d5d0a3a43adf119 (diff) | |
Bulk move libs-gui to boost unordered containers
Diffstat (limited to 'vcl/win')
| -rw-r--r-- | vcl/win/inc/salgdi.h | 4 | ||||
| -rw-r--r-- | vcl/win/source/app/salinfo.cxx | 6 | ||||
| -rw-r--r-- | vcl/win/source/gdi/winlayout.cxx | 4 |
3 files changed, 7 insertions, 7 deletions
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 <vcl/impfont.hxx> #include "boost/scoped_ptr.hpp" -#include <hash_set> +#include <boost/unordered_set.hpp> class ImplFontSelectData; class ImplWinFontEntry; @@ -119,7 +119,7 @@ private: #ifdef GNG_VERT_HACK void ReadGsubTable( HDC ) const; - typedef std::hash_set<sal_UCS4> UcsHashSet; + typedef boost::unordered_set<sal_UCS4> 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 <hash_map> +#include <boost/unordered_map.hpp> 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<LPARAM>(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 <hash_map> +#include <boost/unordered_map.hpp> #include <set> -typedef std::hash_map<int,int> IntMap; +typedef boost::unordered_map<int,int> IntMap; typedef std::set<int> IntSet; // Graphite headers |