[Libreoffice-commits] core.git: vcl/win

[Caolán McNamara]

 vcl/win/source/app/salinfo.cxx   |    6 +++---
 vcl/win/source/gdi/winlayout.cxx |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 42a4de0941a6a19c52384e3a5897134dcfebe3f8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 4 18:50:27 2015 +0000

    vcl/win boost::unordered_map->std::unordered_map
    
    Change-Id: I27ac26250c1994e6254b2e662559ce5782b29a73

diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index 3b4eded..b31be87 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 228e67a..9db8f43 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>