Bug 1119072, Part 16: Replace uses of hash_set with unodered_set (gfx), r=bas
authorBrian Smith <brian@briansmith.org>
Thu, 08 Jan 2015 15:42:38 -0800
changeset 251942 4d99239ff0f0a92f7b6ca8e2255b2cb84f910ece
parent 251941 3cdb06dce2b68d0c9981e42a5db498d7c9b614f1
child 251943 db368edfc832743bc793ac59f065c8833446a284
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbas
bugs1119072
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1119072, Part 16: Replace uses of hash_set with unodered_set (gfx), r=bas
gfx/2d/DrawEventRecorder.h
gfx/2d/DrawTargetD2D.h
gfx/2d/DrawTargetD2D1.h
--- a/gfx/2d/DrawEventRecorder.h
+++ b/gfx/2d/DrawEventRecorder.h
@@ -7,17 +7,17 @@
 #define MOZILLA_GFX_DRAWEVENTRECORDER_H_
 
 #include "2D.h"
 #include "RecordedEvent.h"
 #include <ostream>
 #include <fstream>
 
 #if defined(_MSC_VER)
-#include <hash_set>
+#include <unordered_set>
 #else
 #include <set>
 #endif
 
 namespace mozilla {
 namespace gfx {
 
 class PathRecording;
@@ -48,17 +48,17 @@ public:
   }
 
 protected:
   std::ostream *mOutputStream;
 
   virtual void Flush() = 0;
 
 #if defined(_MSC_VER)
-  typedef stdext::hash_set<const void*> ObjectSet;
+  typedef std::unordered_set<const void*> ObjectSet;
 #else
   typedef std::set<const void*> ObjectSet;
 #endif
 
   ObjectSet mStoredPaths;
   ObjectSet mStoredScaledFonts;
 };
 
--- a/gfx/2d/DrawTargetD2D.h
+++ b/gfx/2d/DrawTargetD2D.h
@@ -9,21 +9,17 @@
 #include "2D.h"
 #include "PathD2D.h"
 #include <d3d10_1.h>
 #include "HelpersD2D.h"
 
 #include <vector>
 #include <sstream>
 
-#ifdef _MSC_VER
-#include <hash_set>
-#else
 #include <unordered_set>
-#endif
 
 struct IDWriteFactory;
 
 namespace mozilla {
 namespace gfx {
 
 class SourceSurfaceD2DTarget;
 class SourceSurfaceD2D;
@@ -160,21 +156,17 @@ public:
 
 private:
   TemporaryRef<ID2D1Bitmap>
   GetBitmapForSurface(SourceSurface *aSurface,
                       Rect &aSource);
   friend class AutoSaveRestoreClippedOut;
   friend class SourceSurfaceD2DTarget;
 
-#ifdef _MSC_VER
-  typedef stdext::hash_set<DrawTargetD2D*> TargetSet;
-#else
   typedef std::unordered_set<DrawTargetD2D*> TargetSet;
-#endif
 
   bool InitD2DRenderTarget();
   void PrepareForDrawing(ID2D1RenderTarget *aRT);
 
   // This function will mark the surface as changing, and make sure any
   // copy-on-write snapshots are notified.
   void MarkChanged();
   void FlushTransformToRT() {
--- a/gfx/2d/DrawTargetD2D1.h
+++ b/gfx/2d/DrawTargetD2D1.h
@@ -10,21 +10,17 @@
 #include <d3d11.h>
 #include <d2d1_1.h>
 #include "PathD2D.h"
 #include "HelpersD2D.h"
 
 #include <vector>
 #include <sstream>
 
-#ifdef _MSC_VER
-#include <hash_set>
-#else
 #include <unordered_set>
-#endif
 
 struct IDWriteFactory;
 
 namespace mozilla {
 namespace gfx {
 
 class SourceSurfaceD2D1;
 class GradientStopsD2D;
@@ -149,21 +145,17 @@ public:
   }
 
   static uint64_t mVRAMUsageDT;
   static uint64_t mVRAMUsageSS;
 
 private:
   friend class SourceSurfaceD2D1;
 
-#ifdef _MSC_VER
-  typedef stdext::hash_set<DrawTargetD2D1*> TargetSet;
-#else
   typedef std::unordered_set<DrawTargetD2D1*> TargetSet;
-#endif
 
   // This function will mark the surface as changing, and make sure any
   // copy-on-write snapshots are notified.
   void MarkChanged();
   void PrepareForDrawing(CompositionOp aOp, const Pattern &aPattern);
   void FinalizeDrawing(CompositionOp aOp, const Pattern &aPattern);
   void FlushTransformToDC() {
     if (mTransformDirty) {