зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1119072, Part 16: Replace uses of hash_set with unodered_set (gfx), r=bas
--HG-- extra : rebase_source : 6fe532f999372f71b7e544231b4727c86aa34d70
This commit is contained in:
Родитель
713ef86ae7
Коммит
f13c2f6263
|
@ -12,7 +12,7 @@
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
#include <hash_set>
|
#include <unordered_set>
|
||||||
#else
|
#else
|
||||||
#include <set>
|
#include <set>
|
||||||
#endif
|
#endif
|
||||||
|
@ -53,7 +53,7 @@ protected:
|
||||||
virtual void Flush() = 0;
|
virtual void Flush() = 0;
|
||||||
|
|
||||||
#if defined(_MSC_VER)
|
#if defined(_MSC_VER)
|
||||||
typedef stdext::hash_set<const void*> ObjectSet;
|
typedef std::unordered_set<const void*> ObjectSet;
|
||||||
#else
|
#else
|
||||||
typedef std::set<const void*> ObjectSet;
|
typedef std::set<const void*> ObjectSet;
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -14,11 +14,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#include <hash_set>
|
|
||||||
#else
|
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#endif
|
|
||||||
|
|
||||||
struct IDWriteFactory;
|
struct IDWriteFactory;
|
||||||
|
|
||||||
|
@ -165,11 +161,7 @@ private:
|
||||||
friend class AutoSaveRestoreClippedOut;
|
friend class AutoSaveRestoreClippedOut;
|
||||||
friend class SourceSurfaceD2DTarget;
|
friend class SourceSurfaceD2DTarget;
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
typedef stdext::hash_set<DrawTargetD2D*> TargetSet;
|
|
||||||
#else
|
|
||||||
typedef std::unordered_set<DrawTargetD2D*> TargetSet;
|
typedef std::unordered_set<DrawTargetD2D*> TargetSet;
|
||||||
#endif
|
|
||||||
|
|
||||||
bool InitD2DRenderTarget();
|
bool InitD2DRenderTarget();
|
||||||
void PrepareForDrawing(ID2D1RenderTarget *aRT);
|
void PrepareForDrawing(ID2D1RenderTarget *aRT);
|
||||||
|
|
|
@ -15,11 +15,7 @@
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
#include <hash_set>
|
|
||||||
#else
|
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
#endif
|
|
||||||
|
|
||||||
struct IDWriteFactory;
|
struct IDWriteFactory;
|
||||||
|
|
||||||
|
@ -154,11 +150,7 @@ public:
|
||||||
private:
|
private:
|
||||||
friend class SourceSurfaceD2D1;
|
friend class SourceSurfaceD2D1;
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
|
||||||
typedef stdext::hash_set<DrawTargetD2D1*> TargetSet;
|
|
||||||
#else
|
|
||||||
typedef std::unordered_set<DrawTargetD2D1*> TargetSet;
|
typedef std::unordered_set<DrawTargetD2D1*> TargetSet;
|
||||||
#endif
|
|
||||||
|
|
||||||
// This function will mark the surface as changing, and make sure any
|
// This function will mark the surface as changing, and make sure any
|
||||||
// copy-on-write snapshots are notified.
|
// copy-on-write snapshots are notified.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче