summaryrefslogtreecommitdiffstats
path: root/src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch
diff options
context:
space:
mode:
Diffstat (limited to 'src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch')
-rw-r--r--src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch b/src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch
deleted file mode 100644
index 72221117c4..0000000000
--- a/src/angle/patches/0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a814e99f287ff19317ab1651428a5fa330aefd08 Mon Sep 17 00:00:00 2001
-From: Andrew Knight <andrew.knight@digia.com>
-Date: Wed, 2 Jul 2014 08:33:00 +0300
-Subject: [PATCH 11/12] ANGLE: Fix compilation error on MinGW caused by
- trace_event.h
-
-The event trace header in ANGLE's third_party directory has an unused
-template which causes a compilation error on MinGW. Disable this part
-of the code.
-
-Change-Id: I167eac56507fafba34e3eb5ce6071d8f136a4e41
----
- src/3rdparty/angle/src/third_party/trace_event/trace_event.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
-index 637cf9a..96ac910 100644
---- a/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
-+++ b/src/3rdparty/angle/src/third_party/trace_event/trace_event.h
-@@ -791,6 +791,7 @@ private:
- // TraceEventSamplingStateScope records the current sampling state
- // and sets a new sampling state. When the scope exists, it restores
- // the sampling state having recorded.
-+#if 0 // This is not used by ANGLE and causes a compilation error on MinGW
- template<size_t BucketNumber>
- class SamplingStateScope {
- public:
-@@ -818,6 +819,7 @@ public:
- private:
- const char* m_previousState;
- };
-+#endif
-
- } // namespace TraceEvent
-
---
-1.9.0.msysgit.0
-