diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2011-11-18 09:44:46 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 19:22:22 (GMT) |
| commit | 9912af2108398b8633f91300c455455f6e16e482 (patch) | |
| tree | 55b3d89c5bca42d688b159e4af26505242303e17 | |
| parent | f764163c1c9cd2ea575971689096921e017d1a46 (diff) | |
| download | Qt-9912af2108398b8633f91300c455455f6e16e482.zip Qt-9912af2108398b8633f91300c455455f6e16e482.tar.gz Qt-9912af2108398b8633f91300c455455f6e16e482.tar.bz2 | |
WEC7 build fix - use ptrdiff_t from std namespace.
WEC7 does not have ptrdiff_t outside std namespace, switched to use
ptrdiff_t from std namespace correspondingly as OwnArrayPtr.h does in
operator[].
Task-number: QTBUG-22502
Change-Id: I5c2ffd271cccd12c1fcdca3975ace3e8224e00bf
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h index 9dfb969..b16ea72 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StdLibExtras.h @@ -46,7 +46,7 @@ // OBJECT_OFFSETOF: Like the C++ offsetof macro, but you can use it with classes. // The magic number 0x4000 is insignificant. We use it to avoid using NULL, since // NULL can cause compiler problems, especially in cases of multiple inheritance. -#define OBJECT_OFFSETOF(class, field) (reinterpret_cast<ptrdiff_t>(&(reinterpret_cast<class*>(0x4000)->field)) - 0x4000) +#define OBJECT_OFFSETOF(class, field) (reinterpret_cast<std::ptrdiff_t>(&(reinterpret_cast<class*>(0x4000)->field)) - 0x4000) // STRINGIZE: Can convert any value to quoted string, even expandable macros #define STRINGIZE(exp) #exp |