Kaydet (Commit) 42a4de09 authored tarafından Caolán McNamara's avatar Caolán McNamara

vcl/win boost::unordered_map->std::unordered_map

Change-Id: I27ac26250c1994e6254b2e662559ce5782b29a73
üst dfeb898b
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include "svdata.hxx" #include "svdata.hxx"
#include <boost/unordered_map.hpp> #include <unordered_map>
SalSystem* WinSalInstance::CreateSalSystem() SalSystem* WinSalInstance::CreateSalSystem()
{ {
...@@ -105,7 +105,7 @@ bool WinSalSystem::initMonitors() ...@@ -105,7 +105,7 @@ bool WinSalSystem::initMonitors()
DISPLAY_DEVICEW aDev; DISPLAY_DEVICEW aDev;
aDev.cb = sizeof( aDev ); aDev.cb = sizeof( aDev );
DWORD nDevice = 0; DWORD nDevice = 0;
boost::unordered_map< OUString, int, OUStringHash > aDeviceStringCount; std::unordered_map< OUString, int, OUStringHash > aDeviceStringCount;
while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) ) while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) )
{ {
if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE) if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
...@@ -130,7 +130,7 @@ bool WinSalSystem::initMonitors() ...@@ -130,7 +130,7 @@ bool WinSalSystem::initMonitors()
EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) ); EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) );
// append monitor numbers to name strings // append monitor numbers to name strings
boost::unordered_map< OUString, int, OUStringHash > aDevCount( aDeviceStringCount ); std::unordered_map< OUString, int, OUStringHash > aDevCount( aDeviceStringCount );
unsigned int nMonitorCount = m_aMonitors.size(); unsigned int nMonitorCount = m_aMonitors.size();
for( unsigned int i = 0; i < nMonitorCount; i++ ) for( unsigned int i = 0; i < nMonitorCount; i++ )
{ {
......
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
#include <shlwapi.h> #include <shlwapi.h>
#include <winver.h> #include <winver.h>
#include <boost/unordered_map.hpp> #include <unordered_map>
typedef boost::unordered_map<int,int> IntMap; typedef std::unordered_map<int,int> IntMap;
// Graphite headers // Graphite headers
#include <config_graphite.h> #include <config_graphite.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment