diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:39 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-24 12:48:42 +0200 |
| commit | 840f6a40e6218992b5b9d451ee3c0886a4846c89 (patch) | |
| tree | 2b808decc7adf5218b810d2de6b45c5a8b4cfc42 /src/3rdparty | |
| parent | 109bf980b37fed405c6c1eb14cb9c83ff897e389 (diff) | |
| parent | 2e3870fe37d36ccf4bd84eb90e1d5e08ad00c1bc (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/renderer/IndexRangeCache.cpp | 2 |
1 files changed, 1 insertions, 1 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 } |