summaryrefslogtreecommitdiffstats
path: root/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@digia.com>2013-10-14 17:04:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-15 13:13:30 +0200
commit0008a6f4000674020db96ff4475094d049d094f6 (patch)
tree903e8d829dbc03996434a9e43b2bf3fad405ac09 /src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch
parentdd2e1c58a76d946f8e7b6acb8dc14c52633e703a (diff)
Fix compilation of ANGLE on MinGW
This broke with commit 89f9bc9c5f873d6763e35d2f92d31c28f8fb5262. Task-number: QTBUG-34080 Change-Id: Ib3c7a3c90db7dc04f417eba4c1328390f45e5e5f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch')
-rw-r--r--src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch b/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch
index 0e72c57be6..2fa23aed8f 100644
--- a/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch
+++ b/src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch
@@ -22,7 +22,7 @@ index 610a5ef..95a6961 100644
+#if defined(_MSC_VER) && _MSC_VER < 1600
+ return std::tr1::make_tuple(type, offset, count) < std::tr1::make_tuple(rhs.type, rhs.offset, rhs.count);
+#else
-+ return std::make_tuple(type, offset, count) < std::tr1::make_tuple(rhs.type, rhs.offset, rhs.count);
++ return std::make_tuple(type, offset, count) < std::make_tuple(rhs.type, rhs.offset, rhs.count);
+#endif
}