summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread/qthread_p.h
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2012-09-18 22:41:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-19 16:12:33 +0200
commit8e3e34defd0e19d49be090046ba76decc2adb526 (patch)
tree800bc71b7a63e3886eca3e2e01734efc92713f44 /src/corelib/thread/qthread_p.h
parent1e37d854f71a965ae34c41b7f437683db5e4b6fb (diff)
Remove qUpperBound usages from qtbase
Replace them with std::upper_bound; this allows for deprecation of qUpperBound. Change-Id: Idef01d2228b9a70eee3d52931d7aedb5bb6ba902 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/corelib/thread/qthread_p.h')
-rw-r--r--src/corelib/thread/qthread_p.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index 6597b56893..c14ed23d0b 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -63,6 +63,8 @@
#include "QtCore/qcoreapplication.h"
#include "private/qobject_p.h"
+#include <algorithm>
+
QT_BEGIN_NAMESPACE
@@ -124,7 +126,7 @@ public:
// insert event in descending priority order, using upper
// bound for a given priority (to ensure proper ordering
// of events with the same priority)
- QPostEventList::iterator at = qUpperBound(begin() + insertionOffset, end(), priority);
+ QPostEventList::iterator at = std::upper_bound(begin() + insertionOffset, end(), priority);
insert(at, ev);
}
}