Skip to content

Commit 45d7861

Browse files
authored
Merge pull request swiftlang#35073 from drodriguez/vs2017-ternary-dont-move
[driver] Use if/else instead of ternary, to please VS2017.
2 parents 632dfcf + 322f02a commit 45d7861

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

lib/Driver/Compilation.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,8 +1802,11 @@ namespace driver {
18021802

18031803
fine_grained_dependencies::ModuleDepGraph &&
18041804
takeFineGrainedDepGraph(const bool forRanges) && {
1805-
return forRanges ? std::move(FineGrainedDepGraphForRanges)
1806-
: std::move(FineGrainedDepGraph);
1805+
if (forRanges) {
1806+
return std::move(FineGrainedDepGraphForRanges);
1807+
} else {
1808+
return std::move(FineGrainedDepGraph);
1809+
}
18071810
}
18081811
};
18091812
} // namespace driver

0 commit comments

Comments
 (0)