diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-01-04 20:20:21 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-01-04 20:20:26 +0000 |
commit | 547b472d5b81ef7f22c32b089bd9f42f721c1cbf (patch) | |
tree | ea29806dcea876d2f7a5ae170a1424e3818e74ac /vcl/inc | |
parent | 42a4de0941a6a19c52384e3a5897134dcfebe3f8 (diff) |
vcl/osx boost::unordered_map->std::unordered_map
Change-Id: I00dabf3307734e319a8187df111e1065ea383524
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/osx/saldata.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/quartz/salgdi.h | 4 | ||||
-rw-r--r-- | vcl/inc/win/salgdi.h | 4 |
4 files changed, 9 insertions, 9 deletions
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 <list> -#include <vector> #include <map> -#include <boost/unordered_set.hpp> +#include <unordered_set> +#include <vector> #include <cstdio> #include <cstdarg> @@ -70,7 +70,7 @@ public: SALTIMERPROC mpTimerProc; // timer callback proc AquaSalInstance *mpFirstInstance; // pointer of first instance std::list<AquaSalFrame*> maFrames; // list of all frames - boost::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck; // for fast check of frame existence + std::unordered_set<const AquaSalFrame*,FrameHash> maFrameCheck;// for fast check of frame existence std::list<AquaSalFrame*> 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 <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/static_assert.hpp> -#include <boost/unordered_map.hpp> -#include <boost/unordered_set.hpp> #include <cassert> #include <cmath> #include <com/sun/star/accessibility/AccessibleEventObject.hpp> @@ -396,6 +394,8 @@ #include <uno/current_context.hxx> #include <uno/dispatcher.h> #include <uno/mapping.hxx> +#include <unordered_map> +#include <unordered_set> #include <unotools/calendarwrapper.hxx> #include <unotools/charclass.hxx> #include <unotools/configmgr.hxx> 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 <boost/unordered_map.hpp> +#include <unordered_map> class AquaSalFrame; class ImplDevFontAttributes; @@ -133,7 +133,7 @@ private: CTFontCollectionRef mpCTFontCollection; CFArrayRef mpCTFontArray; - typedef boost::unordered_map<sal_IntPtr,CoreTextFontData*> CTFontContainer; + typedef std::unordered_map<sal_IntPtr,CoreTextFontData*> 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 <vcl/fontcapabilities.hxx> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_set.hpp> +#include <unordered_set> #include <config_graphite.h> #if ENABLE_GRAPHITE @@ -134,7 +134,7 @@ private: void ReadGsubTable( HDC ) const; - typedef boost::unordered_set<sal_UCS4> UcsHashSet; + typedef std::unordered_set<sal_UCS4> UcsHashSet; mutable UcsHashSet maGsubTable; mutable bool mbGsubRead; public: |