[Libreoffice-commits] core.git: vcl/inc vcl/osx vcl/quartz

[Caolán McNamara]

 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 ++--
 vcl/osx/DataFlavorMapping.hxx   |    4 ++--
 vcl/quartz/ctfonts.cxx          |    2 --
 6 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 547b472d5b81ef7f22c32b089bd9f42f721c1cbf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jan 4 20:20:21 2015 +0000

    vcl/osx boost::unordered_map->std::unordered_map
    
    Change-Id: I00dabf3307734e319a8187df111e1065ea383524

diff --git a/vcl/inc/osx/saldata.hxx b/vcl/inc/osx/saldata.hxx
index 86667ac..4ac39dd 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 9d3018a..484f1e0 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 3abfdb6..87c35c1 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 5a46cb1f..6ce3a61 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:
diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx
index a3cff1c..1917aeb 100644
--- a/vcl/osx/DataFlavorMapping.hxx
+++ b/vcl/osx/DataFlavorMapping.hxx
@@ -29,8 +29,8 @@
 #import <Cocoa/Cocoa.h>
 #include <postmac.h>
 
-#include <boost/unordered_map.hpp>
 #include <memory>
+#include <unordered_map>
 #include <boost/shared_ptr.hpp>
 
 /* An interface to get the clipboard data in either
@@ -119,7 +119,7 @@ private:
 
 private:
   ::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;
 };
 
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx
index 80253ab..5fb772b 100644
--- a/vcl/quartz/ctfonts.cxx
+++ b/vcl/quartz/ctfonts.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <boost/unordered_map.hpp>
-
 #include "impfont.hxx"
 #include "outfont.hxx"
 #include "PhysicalFontCollection.hxx"