diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-28 14:54:43 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-28 15:31:41 +0000 |
| commit | 5c1183aa377ae8de487d5541360369ebd2ee0f6b (patch) | |
| tree | b867d081d67a0d680a7e263bdb1ec139f13cd78a | |
| parent | e1380c8e936124d1b92dac8e0fb39870a05eb0c7 (diff) | |
Executor: Fix undefined behavior
C++17 introduces new requirements on the template parameters of
std::priority_queue.
Task-number: QBS-1051
Change-Id: I9a22b8f2d3c1f0bd532b0a76f5d2a16bebc303f7
Reviewed-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | src/lib/corelib/buildgraph/executor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/executor.h b/src/lib/corelib/buildgraph/executor.h index 1f6bfc7de..a1bb26c05 100644 --- a/src/lib/corelib/buildgraph/executor.h +++ b/src/lib/corelib/buildgraph/executor.h @@ -107,7 +107,8 @@ private: bool operator() (const BuildGraphNode *x, const BuildGraphNode *y) const; }; - typedef std::priority_queue<Artifact *, std::vector<BuildGraphNode *>, ComparePriority> Leaves; + typedef std::priority_queue<BuildGraphNode *, std::vector<BuildGraphNode *>, + ComparePriority> Leaves; void doBuild(); void prepareAllNodes(); |