diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-29 12:25:16 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-29 13:24:20 (GMT) |
| commit | cc5ae1831e54702f7bb8477ab3b14ab9832c064c (patch) | |
| tree | 872d6ccf323b249c88c71443f97e51b4b2840992 | |
| parent | 97b2272e91e25418f63328c681cef54bdc1e43ff (diff) | |
| download | Qt-cc5ae1831e54702f7bb8477ab3b14ab9832c064c.zip Qt-cc5ae1831e54702f7bb8477ab3b14ab9832c064c.tar.gz Qt-cc5ae1831e54702f7bb8477ab3b14ab9832c064c.tar.bz2 | |
Ensure that we return QPair<long,long> in all cases.
Fixes a compilation failure on AIX.
Reviewed-By: Marius Storm-Olsen
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_unix.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qelapsedtimer_unix.cpp b/src/corelib/tools/qelapsedtimer_unix.cpp index 85d7fa8..1a7bc71 100644 --- a/src/corelib/tools/qelapsedtimer_unix.cpp +++ b/src/corelib/tools/qelapsedtimer_unix.cpp @@ -97,19 +97,19 @@ static inline QPair<long, long> do_gettime() #if (_POSIX_MONOTONIC_CLOCK-0 > 0) timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - return qMakePair(ts.tv_sec, ts.tv_nsec); + return qMakePair<long,long>(ts.tv_sec, ts.tv_nsec); #else # if !defined(QT_NO_CLOCK_MONOTONIC) && !defined(QT_BOOTSTRAPPED) if (QElapsedTimer::isMonotonic()) { timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); - return qMakePair(ts.tv_sec, ts.tv_nsec); + return qMakePair<long,long>(ts.tv_sec, ts.tv_nsec); } # endif // use gettimeofday timeval tv; ::gettimeofday(&tv, 0); - return qMakePair(tv.tv_sec, tv.tv_usec); + return qMakePair<long,long>(tv.tv_sec, tv.tv_usec); #endif } |