diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-18 23:24:24 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-02-18 23:24:24 (GMT) |
| commit | 9fbbd3146c42869d56da8c82501be1e6a6595f36 (patch) | |
| tree | 092af029342fa1c5a59bc30c85d7257c88718609 /src/corelib/tools/qsharedpointer_impl.h | |
| parent | 4baa9dfb5273d7b501dcb3f456983262c53cc8d1 (diff) | |
| parent | 52e517b50aafd6cc0bec597abd50d8b3f7e982dd (diff) | |
| download | Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.zip Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.tar.gz Qt-9fbbd3146c42869d56da8c82501be1e6a6595f36.tar.bz2 | |
Merge remote branch 'origin/4.6' into integration-master-from-4.6
Conflicts:
src/corelib/codecs/qtextcodec.h
Diffstat (limited to 'src/corelib/tools/qsharedpointer_impl.h')
| -rw-r--r-- | src/corelib/tools/qsharedpointer_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 0dcea5f..d85c248 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -132,7 +132,7 @@ namespace QtSharedPointer { typedef const value_type *const_pointer; typedef value_type &reference; typedef const value_type &const_reference; - typedef ptrdiff_t difference_type; + typedef qptrdiff difference_type; inline T *data() const { return value; } inline bool isNull() const { return !data(); } @@ -541,7 +541,7 @@ public: typedef const value_type *const_pointer; typedef value_type &reference; typedef const value_type &const_reference; - typedef ptrdiff_t difference_type; + typedef qptrdiff difference_type; inline bool isNull() const { return d == 0 || d->strongref == 0 || value == 0; } #ifndef Q_CC_NOKIAX86 |