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/qvector.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/qvector.h')
| -rw-r--r-- | src/corelib/tools/qvector.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 61b22fd..60c17a2 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -164,7 +164,7 @@ public: public: T *i; typedef std::random_access_iterator_tag iterator_category; - typedef ptrdiff_t difference_type; + typedef qptrdiff difference_type; typedef T value_type; typedef T *pointer; typedef T &reference; @@ -197,7 +197,7 @@ public: public: T *i; typedef std::random_access_iterator_tag iterator_category; - typedef ptrdiff_t difference_type; + typedef qptrdiff difference_type; typedef T value_type; typedef const T *pointer; typedef const T &reference; @@ -261,7 +261,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; typedef iterator Iterator; typedef const_iterator ConstIterator; typedef int size_type; |