32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 88297d02fd1aed6cac258b72d9d0a8baabad6203 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Hartmann <Thomas.Hartmann@digia.com>
|
|
Date: Mon, 17 Feb 2014 16:56:51 +0200
|
|
Subject: [PATCH] Fix compilation for MSVC 2008 and std::tuple
|
|
|
|
For MSVC 2008 make_tuple is in the tr1 namespace.
|
|
|
|
Change-Id: I4a51f6cabdf068993869b404b12ed1484a21a9d4
|
|
---
|
|
src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp
|
|
index 610a5ef..51d7f0b 100644
|
|
--- a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp
|
|
+++ b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp
|
|
@@ -81,7 +81,11 @@ IndexRangeCache::IndexRange::IndexRange(GLenum typ, intptr_t off, GLsizei c)
|
|
|
|
bool IndexRangeCache::IndexRange::operator<(const IndexRange& rhs) const
|
|
{
|
|
+#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::make_tuple(rhs.type, rhs.offset, rhs.count);
|
|
+#endif
|
|
}
|
|
|
|
IndexRangeCache::IndexBounds::IndexBounds()
|
|
--
|
|
1.8.4.msysgit.0
|
|
|