Skip to content

Commit

Permalink
Fix a rare case of imcompatibility between base_control_t and control_t.
Browse files Browse the repository at this point in the history
Both branches of a ternary operator should yield the same type;
compatibility is not enough in that case.
  • Loading branch information
pan- committed Aug 30, 2016
1 parent 85bce14 commit a9d9987
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion TESTS/storage_abstraction/basicAPI/basicAPI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ control_t test_initialize(const size_t call_count)
TEST_ASSERT(rc >= ARM_DRIVER_OK);
if (rc == ARM_DRIVER_OK) {
TEST_ASSERT_EQUAL(1, capabilities.asynchronous_ops);
return (call_count < REPEAT_INSTANCES) ? (CaseTimeout(200) + CaseRepeatAll) : CaseNext;
return (call_count < REPEAT_INSTANCES) ? (CaseTimeout(200) + CaseRepeatAll) : (control_t) CaseNext;
}

TEST_ASSERT(rc == 1);
Expand Down

0 comments on commit a9d9987

Please sign in to comment.