From 547b472d5b81ef7f22c32b089bd9f42f721c1cbf Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 4 Jan 2015 20:20:21 +0000 Subject: vcl/osx boost::unordered_map->std::unordered_map Change-Id: I00dabf3307734e319a8187df111e1065ea383524 --- vcl/inc/osx/saldata.hxx | 6 +++--- vcl/inc/pch/precompiled_vcl.hxx | 4 ++-- vcl/inc/quartz/salgdi.h | 4 ++-- vcl/inc/win/salgdi.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'vcl/inc') diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx index 86667acbe1cd..4ac39dd960d3 100644 --- a/vcl/inc/osx/saldata.hxx +++ b/vcl/inc/osx/saldata.hxx @@ -34,9 +34,9 @@ #include "salwtype.hxx" #include -#include #include -#include +#include +#include #include #include @@ -70,7 +70,7 @@ public: SALTIMERPROC mpTimerProc; // timer callback proc AquaSalInstance *mpFirstInstance; // pointer of first instance std::list maFrames; // list of all frames - boost::unordered_set maFrameCheck; // for fast check of frame existence + std::unordered_set maFrameCheck;// for fast check of frame existence std::list maPresentationFrames; // list of frames in presentation mode SalObject *mpFirstObject; // pointer of first object window SalVirtualDevice *mpFirstVD; // first VirDev diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 9d3018a4edbf..484f1e04f49d 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -146,8 +146,6 @@ #include #include #include -#include -#include #include #include #include @@ -396,6 +394,8 @@ #include #include #include +#include +#include #include #include #include diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 3abfdb61b9cc..87c35c1fa7da 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -43,7 +43,7 @@ #include "salgdi.hxx" #include "quartz/salgdicommon.hxx" -#include +#include class AquaSalFrame; class ImplDevFontAttributes; @@ -133,7 +133,7 @@ private: CTFontCollectionRef mpCTFontCollection; CFArrayRef mpCTFontArray; - typedef boost::unordered_map CTFontContainer; + typedef std::unordered_map CTFontContainer; CTFontContainer maFontContainer; }; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 5a46cb1ff8dd..6ce3a6118cd0 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include #if ENABLE_GRAPHITE @@ -134,7 +134,7 @@ private: void ReadGsubTable( HDC ) const; - typedef boost::unordered_set UcsHashSet; + typedef std::unordered_set UcsHashSet; mutable UcsHashSet maGsubTable; mutable bool mbGsubRead; public: -- cgit