diff options
author | Andrew Knight <andrew.knight@digia.com> | 2014-09-25 13:22:55 +0300 |
---|---|---|
committer | Andrew Knight <andrew.knight@digia.com> | 2014-09-29 16:09:29 +0200 |
commit | 311157c3c6849e8efccd88f7594bb34c570a6780 (patch) | |
tree | a50c252b638488326529c0e69aa05e42abce7462 /src/3rdparty/angle/src/common/angleutils.h | |
parent | 04d3a89e20d49a3b5015b071bfdedc81973b090c (diff) |
ANGLE: Upgrade to 2.1~abce76206141
Upgrade to address issues discovered since the last upgrade.
Patch notes:
0000-General-fixes-for-ANGLE-2.1.patch
added removal of the unused third-party tracing functions
0003-Fix-compilation-with-MinGW-gcc-64-bit.patch
removed as it is no longer needed
0011-ANGLE-Fix-compilation-error-on-MinGW-caused-by-trace.patch
removed as it is no longer needed
0016-ANGLE-Fix-compilation-with-MinGW-D3D11.patch
now supports MinGW 64-bit
[ChangeLog][Third-party libraries] ANGLE updated to 2.1~f8602ad91e4f
Task-number: QTBUG-40649
Task-number: QTBUG-40658
Task-number: QTBUG-41031
Task-number: QTBUG-41081
Task-number: QTBUG-41308
Task-number: QTBUG-41563
Change-Id: I9f776c8d5cb94ddb12d608a8d5630bfc54437bea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/3rdparty/angle/src/common/angleutils.h')
-rw-r--r-- | src/3rdparty/angle/src/common/angleutils.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/angle/src/common/angleutils.h b/src/3rdparty/angle/src/common/angleutils.h index d94b4f5ff9..ddbbd5f501 100644 --- a/src/3rdparty/angle/src/common/angleutils.h +++ b/src/3rdparty/angle/src/common/angleutils.h @@ -16,6 +16,7 @@ #include <string> #include <set> #include <sstream> +#include <cstdarg> // A macro to disallow the copy constructor and operator= functions // This must be used in the private: declarations for a class @@ -23,8 +24,8 @@ TypeName(const TypeName&); \ void operator=(const TypeName&) -template <typename T, unsigned int N> -inline unsigned int ArraySize(T(&)[N]) +template <typename T, size_t N> +inline size_t ArraySize(T(&)[N]) { return N; } @@ -131,6 +132,9 @@ inline std::string Str(int i) return strstr.str(); } +std::string FormatString(const char *fmt, va_list vararg); +std::string FormatString(const char *fmt, ...); + #if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #endif |