diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 6 | ||||
-rw-r--r-- | src/corelib/tools/qlist.h | 2 |
2 files changed, 4 insertions, 4 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) diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 333ce72849..16f058b001 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -262,7 +262,7 @@ public: inline const_iterator &operator-=(int j) { i-=j; return *this; } inline const_iterator operator+(int j) const { return const_iterator(i+j); } inline const_iterator operator-(int j) const { return const_iterator(i-j); } - inline int operator-(const_iterator j) const { return i - j.i; } + inline int operator-(const_iterator j) const { return int(i - j.i); } }; friend class const_iterator; |