diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-31 13:51:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-12 04:30:20 +0200 |
| commit | 290655c8a2401b84b9ddd223b67c06182886c597 (patch) | |
| tree | bde39afdf33134dd79ade0b61796d615e0bc9f3b /src/corelib/tools/qarraydataops.h | |
| parent | c5665a182db5002afe6dc7c69f343e89de5fca31 (diff) | |
Fix compilation of tests/auto/corelib/tools with QT_STRICT_ITERATORS
Most fixes are simple and quite obvious. The ones more involved are
the ones to QArrayData, which had probably not been compiled with
strict iterators thus far.
Change-Id: Ic4ff84c34fd9a04fd686fecaa98149b1c47c9346
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src/corelib/tools/qarraydataops.h')
| -rw-r--r-- | src/corelib/tools/qarraydataops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index de149b701c..088dd2bdee 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -113,7 +113,7 @@ struct QPodArrayOps Q_ASSERT(e <= where || b > this->end()); // No overlap Q_ASSERT(size_t(e - b) <= this->alloc - uint(this->size)); - ::memmove(where + (e - b), where, (this->end() - where) * sizeof(T)); + ::memmove(where + (e - b), where, (static_cast<const T*>(this->end()) - where) * sizeof(T)); ::memcpy(where, b, (e - b) * sizeof(T)); this->size += (e - b); } |