Remove this .rej that didn't merge properly. No bug.
authorChris Jones <jones.chris.g@gmail.com>
Tue, 25 Sep 2012 23:44:39 -0700
changeset 108209 982ab7bbe7a025e3f2cbbe4ae5267d1dd4ca8811
parent 108208 90ff76b2032e3870691ff1e51b5757a121fe89ef
child 108210 44526a1c4bc7d1f640f51e8e35269384d151c773
push id82
push usershu@rfrn.org
push dateFri, 05 Oct 2012 13:20:22 +0000
milestone18.0a1
Remove this .rej that didn't merge properly. No bug.
gfx/2d/DrawEventRecorder.h.rej
deleted file mode 100644
--- a/gfx/2d/DrawEventRecorder.h.rej
+++ /dev/null
@@ -1,61 +0,0 @@
---- DrawEventRecorder.h
-+++ DrawEventRecorder.h
-@@ -6,34 +6,20 @@
- #ifndef MOZILLA_GFX_DRAWEVENTRECORDER_H_
- #define MOZILLA_GFX_DRAWEVENTRECORDER_H_
- 
- #include "2D.h"
- #include "RecordedEvent.h"
- #include <ostream>
- #include <fstream>
- 
--#if defined(_MSC_VER) || defined(MOZ_WIDGET_ANDROID)
-+#if defined(_MSC_VER)
- #include <hash_set>
- #else
--#include <ext/hash_set>
--#endif
--
--#ifndef _MSC_VER
--#ifndef MOZ_WIDGET_ANDROID
--namespace __gnu_cxx {
--#endif
--template<>
--struct hash<void *> {
--  size_t operator()(const void * __x) const {
--    return reinterpret_cast<size_t>(__x); }
--};
--#ifndef MOZ_WIDGET_ANDROID
--}
--#endif
-+#include <unordered_set>
- #endif
- 
- namespace mozilla {
- namespace gfx {
- 
- class PathRecording;
- 
- class DrawEventRecorderPrivate : public DrawEventRecorder
-@@ -62,20 +48,18 @@ public:
- 
- protected:
-   std::ostream *mOutputStream;
- 
-   virtual void Flush() = 0;
- 
- #if defined(_MSC_VER)
-   typedef stdext::hash_set<const void*> ObjectSet;
--#elif defined(MOZ_WIDGET_ANDROID)
--  typedef hash_set<const void*> ObjectSet;
- #else
--  typedef __gnu_cxx::hash_set<const void*, __gnu_cxx::hash<void*> > ObjectSet;
-+  typedef std::unordered_set<const void*> ObjectSet;
- #endif
- 
-   ObjectSet mStoredPaths;
-   ObjectSet mStoredScaledFonts;
- };
- 
- class DrawEventRecorderFile : public DrawEventRecorderPrivate
- {