[gentoo-commits] gentoo-x86 commit in dev-qt/qtcore/files: rename-qAbs-function-for-timeval.patch

[Davide Pesavento (pesa)]

pesa        13/05/27 09:49:57

  Added:                rename-qAbs-function-for-timeval.patch
  Log:
  Fix build with USE=c++0x and gcc-4.8.0 (bug 465590)
  
  (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 17A85C72)

Revision  Changes    Path
1.1                  dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtcore/files/rename-qAbs-function-for-timeval.patch?rev=1.1&content-type=text/plain

Index: rename-qAbs-function-for-timeval.patch
===================================================================
From 522c899b777eb25adb7e235baf0027c0c0a9119a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20E=2E=20Narv=C3=A1ez?= <david.narvaez@××××××××.org>
Date: Sat, 23 Feb 2013 23:14:50 -0500
Subject: [PATCH] Rename qAbs Function for timeval

This decouples it from qAbs which is declared as a constexpr under
certain compilation flags and enables for qtbase to be compiled with
GCC 4.8

Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9
Reviewed-by: Thiago Macieira <thiago.macieira@×××××.com>
(cherry-picked from qtbase commit d9ff510f02bba63dabe7a081a68296056a89ae4c)
Reviewed-by: Olivier Goffart <ogoffart@×××××.com>
---
 src/corelib/kernel/qeventdispatcher_unix.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp
index df3cda1..abf1c29 100644
--- a/src/corelib/kernel/qeventdispatcher_unix.cpp
+++ b/src/corelib/kernel/qeventdispatcher_unix.cpp
@@ -356,8 +356,7 @@ timeval QTimerInfoList::updateCurrentTime()
 
 #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED)
 
-template <>
-timeval qAbs(const timeval &t)
+timeval qAbsTimeval(const timeval &t)
 {
     timeval tmp = t;
     if (tmp.tv_sec < 0) {
@@ -406,7 +405,7 @@ bool QTimerInfoList::timeChanged(timeval *delta)
     timeval tickGranularity;
     tickGranularity.tv_sec = 0;
     tickGranularity.tv_usec = msPerTick * 1000;
-    return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10);
+    return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10);
 }
 
 void QTimerInfoList::repairTimersIfNeeded()
-- 
1.8.2.1