[PATCH QGit] Fix compiler warning due to ambiguous 'else'
From: Markus Heidelberg <hidden>
Date: 2016-06-15 22:46:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
g++ 4.3.2 produced the following warning: treeview.cpp: In member function ‘void TreeView::updateTree()’: treeview.cpp:221: warning: suggest explicit braces to avoid ambiguous ‘else’ Signed-off-by: Markus Heidelberg <redacted> --- src/treeview.cpp | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/treeview.cpp b/src/treeview.cpp
index 346c577..d391a32 100644
--- a/src/treeview.cpp
+++ b/src/treeview.cpp@@ -222,7 +222,7 @@ void TreeView::updateTree() { && treeIsValid && root && st->sha() != QGit::ZERO_SHA - && root->treeSha != QGit::ZERO_SHA) + && root->treeSha != QGit::ZERO_SHA) { // root->treeSha could reference a different sha from current // one in case the tree is the same, i.e. has the same files. // so we prefer to use the previous state sha to call isSameFiles()
@@ -233,6 +233,7 @@ void TreeView::updateTree() { newTree = !git->isSameFiles(st->sha(false), st->sha(true)); else newTree = !git->isSameFiles(root->treeSha, st->sha(true)); + } if (newTree) // ok, we really need to update the tree setTree(st->sha());
--
1.6.3.2.236.ge505d