Kaydet (Commit) 547b472d authored tarafından Caolán McNamara's avatar Caolán McNamara

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

Change-Id: I00dabf3307734e319a8187df111e1065ea383524
üst 42a4de09
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
#include "salwtype.hxx" #include "salwtype.hxx"
#include <list> #include <list>
#include <vector>
#include <map> #include <map>
#include <boost/unordered_set.hpp> #include <unordered_set>
#include <vector>
#include <cstdio> #include <cstdio>
#include <cstdarg> #include <cstdarg>
...@@ -70,7 +70,7 @@ public: ...@@ -70,7 +70,7 @@ public:
SALTIMERPROC mpTimerProc; // timer callback proc SALTIMERPROC mpTimerProc; // timer callback proc
AquaSalInstance *mpFirstInstance; // pointer of first instance AquaSalInstance *mpFirstInstance; // pointer of first instance
std::list<AquaSalFrame*> maFrames; // list of all frames 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 std::list<AquaSalFrame*> maPresentationFrames; // list of frames in presentation mode
SalObject *mpFirstObject; // pointer of first object window SalObject *mpFirstObject; // pointer of first object window
SalVirtualDevice *mpFirstVD; // first VirDev SalVirtualDevice *mpFirstVD; // first VirDev
......
...@@ -146,8 +146,6 @@ ...@@ -146,8 +146,6 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/static_assert.hpp> #include <boost/static_assert.hpp>
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
#include <cassert> #include <cassert>
#include <cmath> #include <cmath>
#include <com/sun/star/accessibility/AccessibleEventObject.hpp> #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
...@@ -396,6 +394,8 @@ ...@@ -396,6 +394,8 @@
#include <uno/current_context.hxx> #include <uno/current_context.hxx>
#include <uno/dispatcher.h> #include <uno/dispatcher.h>
#include <uno/mapping.hxx> #include <uno/mapping.hxx>
#include <unordered_map>
#include <unordered_set>
#include <unotools/calendarwrapper.hxx> #include <unotools/calendarwrapper.hxx>
#include <unotools/charclass.hxx> #include <unotools/charclass.hxx>
#include <unotools/configmgr.hxx> #include <unotools/configmgr.hxx>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "salgdi.hxx" #include "salgdi.hxx"
#include "quartz/salgdicommon.hxx" #include "quartz/salgdicommon.hxx"
#include <boost/unordered_map.hpp> #include <unordered_map>
class AquaSalFrame; class AquaSalFrame;
class ImplDevFontAttributes; class ImplDevFontAttributes;
...@@ -133,7 +133,7 @@ private: ...@@ -133,7 +133,7 @@ private:
CTFontCollectionRef mpCTFontCollection; CTFontCollectionRef mpCTFontCollection;
CFArrayRef mpCTFontArray; CFArrayRef mpCTFontArray;
typedef boost::unordered_map<sal_IntPtr,CoreTextFontData*> CTFontContainer; typedef std::unordered_map<sal_IntPtr,CoreTextFontData*> CTFontContainer;
CTFontContainer maFontContainer; CTFontContainer maFontContainer;
}; };
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <vcl/fontcapabilities.hxx> #include <vcl/fontcapabilities.hxx>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include <boost/unordered_set.hpp> #include <unordered_set>
#include <config_graphite.h> #include <config_graphite.h>
#if ENABLE_GRAPHITE #if ENABLE_GRAPHITE
...@@ -134,7 +134,7 @@ private: ...@@ -134,7 +134,7 @@ private:
void ReadGsubTable( HDC ) const; void ReadGsubTable( HDC ) const;
typedef boost::unordered_set<sal_UCS4> UcsHashSet; typedef std::unordered_set<sal_UCS4> UcsHashSet;
mutable UcsHashSet maGsubTable; mutable UcsHashSet maGsubTable;
mutable bool mbGsubRead; mutable bool mbGsubRead;
public: public:
......
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#include <postmac.h> #include <postmac.h>
#include <boost/unordered_map.hpp>
#include <memory> #include <memory>
#include <unordered_map>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
/* An interface to get the clipboard data in either /* An interface to get the clipboard data in either
...@@ -119,7 +119,7 @@ private: ...@@ -119,7 +119,7 @@ private:
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
typedef boost::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes; typedef std::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes;
mutable OfficeOnlyTypes maOfficeOnlyTypes; mutable OfficeOnlyTypes maOfficeOnlyTypes;
}; };
......
...@@ -17,8 +17,6 @@ ...@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <boost/unordered_map.hpp>
#include "impfont.hxx" #include "impfont.hxx"
#include "outfont.hxx" #include "outfont.hxx"
#include "PhysicalFontCollection.hxx" #include "PhysicalFontCollection.hxx"
......
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