Skip to content

Commit b3a8206

Browse files
committed
fix: 修复构建失败
Signed-off-by: Certseeds <51754303+Certseeds@users.noreply.github.com>
1 parent 0f72989 commit b3a8206

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

algorithm/tree/leetcode_617.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ class Solution {
3636
return willreturn;
3737
}
3838
public:
39-
TreeNode *mergeTrees(TreeNode *t1, TreeNode *t2) {
39+
std::pair<TreeNode *, vector<TreeNode *>> mergeTrees(TreeNode *t1, TreeNode *t2) {
4040
vector<TreeNode *> will_return{};
4141
const auto func = [&will_return](TreeNode *node) { will_return.push_back(node); };
4242
const auto result = mergeTreesRec(t1, t2, func);
43-
return result;
43+
return {result, will_return};
4444
}
4545
};
4646

algorithm/tree/leetcode_617_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ TEST_CASE("test_case 1 [test_617]", "[test_617]") {
2828
TreeNode::No, TreeNode::No, TreeNode::No};
2929
const vector<int32_t> result{3, 4, 5, 5, 4, TreeNode::No, 7, TreeNode::No, TreeNode::No, TreeNode::No, TreeNode::No,
3030
TreeNode::No, TreeNode::No};
31-
const auto resultPtr = solution.mergeTrees(input1[0], input2[0]);
31+
const auto[resultPtr, resultNodes] = solution.mergeTrees(input1[0], input2[0]);
3232
CHECK(TREE_NODE::judge_equal(resultPtr, result));
33+
const TreeNodeLink link3{resultNodes};
3334
}
3435
}
3536
#endif //ALGORITHM_TEMPLATE_ALGORITHM_TREE_LEETCODE_617_TEST_HPP

algorithm/tree/leetcode_894_test.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ using TreeNodeLink = TREE_NODE::TreeNodeLink<int32_t>;
2121
using TREE_NODE::numToTree;
2222

2323
TEST_CASE("test_case 1 [test_894]", "[test_894]") {
24-
Solution solution;
25-
// The test case is a placeholder.
26-
// Calling the function to ensure it compiles.
27-
solution.allPossibleFBT(7);
2824
CHECK(std::true_type::value);
2925
}
3026
}

0 commit comments

Comments
 (0)