feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Valgrind: Fix compile on Win

Browse Source 
Fixes compile error C3487 ('const Valgrind::XmlProtocol::Frame':
all return expressions in a lambda must have the same type: previously
it was 'Valgrind::XmlProtocol::Frame')

Change-Id: I6545cd2eda1fba4058bf0dc59ed835fed07f86e8
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Christian Stenger
2016-04-08 12:29:22 +02:00
parent c68d270b0c
commit ed7d5e0d62
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/valgrind/memchecktool.cpp
View File

@@ -97,13 +97,14 @@ namespace Internal {
static ErrorListModel::RelevantFrameFinder makeFrameFinder(const QStringList &projectFiles) static ErrorListModel::RelevantFrameFinder makeFrameFinder(const QStringList &projectFiles)
{ {
return [projectFiles](const Error &error) { return [projectFiles](const Error &error) {
const Frame defaultFrame = Frame();
const QVector<Stack> stacks = error.stacks(); const QVector<Stack> stacks = error.stacks();
if (stacks.isEmpty()) if (stacks.isEmpty())
return Frame(); return defaultFrame;
const Stack &stack = stacks[0]; const Stack &stack = stacks[0];
const QVector<Frame> frames = stack.frames(); const QVector<Frame> frames = stack.frames();
if (frames.isEmpty()) if (frames.isEmpty())
return Frame(); return defaultFrame;
//find the first frame belonging to the project //find the first frame belonging to the project
if (!projectFiles.isEmpty()) { if (!projectFiles.isEmpty()) {