diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-10-14 17:04:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-15 13:13:30 +0200 |
| commit | 0008a6f4000674020db96ff4475094d049d094f6 (patch) | |
| tree | 903e8d829dbc03996434a9e43b2bf3fad405ac09 /src | |
| parent | dd2e1c58a76d946f8e7b6acb8dc14c52633e703a (diff) | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp | 2 | ||||
| -rw-r--r-- | src/angle/patches/0001-Fix-compilation-for-MSVC-2008-and-std-tuple.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp index 95a6961e7b..51d7f0b653 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp @@ -84,7 +84,7 @@ 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::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 } 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 } |