diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:29:41 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-03 14:30:21 +0100 |
| commit | b5ab7ee0d78a30863e3d11bd2ba10ba5f4854bf5 (patch) | |
| tree | d4ab3471f9f92e153fe320e0435a5740c794746b /src/corelib/kernel | |
| parent | ad9554a7f2d4b8a2af3efabc7bc69b9a0ae3751d (diff) | |
| parent | aff3e3c4a20aae52fdafaede8dfcbde2bc990104 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Id13badc270db98806048753fd7fb658aa17f1ede
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 745487627e..83801a20c5 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -876,7 +876,7 @@ struct CapabilitiesImpl<T, std::random_access_iterator_tag> template<typename T> struct ContainerAPI : CapabilitiesImpl<T> { - static int size(const T *t) { return std::distance(t->begin(), t->end()); } + static int size(const T *t) { return int(std::distance(t->begin(), t->end())); } }; template<typename T> @@ -1102,8 +1102,8 @@ public: template<class T> static int sizeImpl(const void *p) - { return std::distance(static_cast<const T*>(p)->begin(), - static_cast<const T*>(p)->end()); } + { return int(std::distance(static_cast<const T*>(p)->begin(), + static_cast<const T*>(p)->end())); } template<class T> static void findImpl(const void *container, const void *p, void **iterator) |