summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-04 18:50:27 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-04 18:50:27 +0000
commit42a4de0941a6a19c52384e3a5897134dcfebe3f8 (patch)
tree9efb6628ba5d6eeb741e8ccf57066776620e5946
parentdfeb898b53c597c7b55cbca714335892e8830c83 (diff)
vcl/win boost::unordered_map->std::unordered_map
Change-Id: I27ac26250c1994e6254b2e662559ce5782b29a73
-rw-r--r--vcl/win/source/app/salinfo.cxx6
-rw-r--r--vcl/win/source/gdi/winlayout.cxx4
2 files changed, 5 insertions, 5 deletions
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 3b4ededbb09f..b31be8748af2 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.cxx
@@ -31,7 +31,7 @@
#include "svdata.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
SalSystem* WinSalInstance::CreateSalSystem()
{
@@ -105,7 +105,7 @@ bool WinSalSystem::initMonitors()
DISPLAY_DEVICEW aDev;
aDev.cb = sizeof( aDev );
DWORD nDevice = 0;
- boost::unordered_map< OUString, int, OUStringHash > aDeviceStringCount;
+ std::unordered_map< OUString, int, OUStringHash > aDeviceStringCount;
while( EnumDisplayDevicesW( NULL, nDevice++, &aDev, 0 ) )
{
if( (aDev.StateFlags & DISPLAY_DEVICE_ACTIVE)
@@ -130,7 +130,7 @@ bool WinSalSystem::initMonitors()
EnumDisplayMonitors( aDesktopRC, NULL, ImplEnumMonitorProc, reinterpret_cast<LPARAM>(this) );
// 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();
for( unsigned int i = 0; i < nMonitorCount; i++ )
{
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 228e67ac937a..9db8f43c72eb 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -42,9 +42,9 @@
#include <shlwapi.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
#include <config_graphite.h>